Skip to content

Commit

Permalink
Merge pull request #3418 from cloudfoundry-incubator/angular7
Browse files Browse the repository at this point in the history
Angular 7 Upgrade
  • Loading branch information
nwmac authored Mar 12, 2019
2 parents f32bb60 + 06345e9 commit 5abcde5
Show file tree
Hide file tree
Showing 242 changed files with 5,215 additions and 4,717 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- golint src/jetstream/...
- ./deploy/ci/travis/update-go-report-card.sh
- stage: Test
- name: Frontend Unit Tests
name: Frontend Unit Tests
env:
- CI_ENV=true
script:
Expand Down
8 changes: 0 additions & 8 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,6 @@
"protractorConfig": "./protractor.conf.js",
"devServerTarget": "stratos:serve"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/test-e2e/tsconfig.e2e.json"
]
}
}
}
},
Expand Down
9 changes: 2 additions & 7 deletions build/karma.conf.creator.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,8 @@ module.exports = function (project) {
},
singleRun: process.env.CI_ENV ? true : false,
files: [{
pattern: './src/**/*.spec.ts',
watched: false
},
{
pattern: path.join(repoRoot, 'node_modules/@angular/material/prebuilt-themes/indigo-pink.css')
}
],
pattern: path.join(repoRoot, 'node_modules/@angular/material/prebuilt-themes/indigo-pink.css')
}],
exclude: [
'**/*-e2e.spec.ts'
]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<mat-card>
<b>ACME Support Info</b>
<app-metadata-item iconFont="stratos-icons" icon="products" label="Documentation">
<a target="_balnk" noopener noreferrer href="https://docs.cloudfoundry.org/">https://docs.cloudfoundry.org</a>
<a target="_blank" noopener noreferrer href="https://docs.cloudfoundry.org/">https://docs.cloudfoundry.org</a>
</app-metadata-item>
<app-metadata-item icon="language" label="Online Support">
<a target="_balnk" noopener noreferrer href="https://www.suse.com">https://www.suse.com</a>
<a target="_blank" noopener noreferrer href="https://www.suse.com">https://www.suse.com</a>
</app-metadata-item>
<app-metadata-item icon="email" label="Contact Support by Email">
<a href="mailto:" noopener noreferrer>support@acme.com</a>
</app-metadata-item>
</mat-card>
</mat-card>
Loading

0 comments on commit 5abcde5

Please sign in to comment.