diff --git a/.travis.yml b/.travis.yml index c00b0364e..73baa8d95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ before_script: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then nohup bash -c "webdriver-manager start 2>&1 &"; fi # Protractor CI after_failure: - - cat /home/travis/build/mgechev/angular2-seed/npm-debug.log + - cat /home/travis/build/mgechev/angular-seed/npm-debug.log branches: only: master diff --git a/README.md b/README.md index 3b5e1b537..36eef19df 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Introduction [![Angular Style Guide](https://mgechev.github.io/angular2-style-guide/images/badge.svg)](https://angular.io/styleguide) -[![Build Status](https://travis-ci.org/mgechev/angular2-seed.svg?branch=master)](https://travis-ci.org/mgechev/angular2-seed) +[![Build Status](https://travis-ci.org/mgechev/angular-seed.svg?branch=master)](https://travis-ci.org/mgechev/angular2-seed) [![Build Status](https://ci.appveyor.com/api/projects/status/github/mgechev/angular2-seed?svg=true)](https://ci.appveyor.com/project/mgechev/angular2-seed) [![Join the chat at https://gitter.im/mgechev/angular2-seed](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mgechev/angular2-seed?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![MIT license](http://img.shields.io/badge/license-MIT-brightgreen.svg)](http://opensource.org/licenses/MIT) @@ -291,6 +291,7 @@ Forks of this project demonstrate how to extend and integrate with other librari │   │   ├── project.config.ts <- configuration of the specific project │   │   ├── seed.config.interfaces.ts │   │   └── seed.config.ts <- generic configuration of the seed project +│   │   └── seed.tslint.json <- generic tslint configuration of the seed project │   ├── config.ts <- exported configuration (merge both seed.config and project.config, project.config overrides seed.config) │   ├── debug.ts │   ├── env <- environment configuration diff --git a/tslint.json b/tslint.json index ceeb289a6..0a54a35b8 100644 --- a/tslint.json +++ b/tslint.json @@ -1,6 +1,5 @@ { "extends": "./tools/config/seed.tslint.json", "rules": { - //overwrite rules defined in seed.tslint.json here or add additional rules } }