Skip to content

Commit

Permalink
Move v2.0 to master
Browse files Browse the repository at this point in the history
  • Loading branch information
onechiporenko committed Sep 26, 2017
1 parent 943927b commit 9ab0c68
Show file tree
Hide file tree
Showing 239 changed files with 15,200 additions and 3,878 deletions.
7 changes: 7 additions & 0 deletions .eslintrc.js
Expand Up @@ -10,5 +10,12 @@ module.exports = {
jquery: true
},
rules: {
"valid-jsdoc": [2, {
"prefer": {
"return": "returns",
},
"requireParamDescription": false,
"requireReturnDescription": false
}]
}
};
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -21,3 +21,5 @@ testem.log
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try

/docs
1 change: 1 addition & 0 deletions .npmignore
@@ -1,5 +1,6 @@
/bower_components
/config/ember-try.js
/docs
/dist
/tests
/tmp
Expand Down
10 changes: 4 additions & 6 deletions .travis.yml
Expand Up @@ -6,6 +6,10 @@ node_js:
- "4"

sudo: false
dist: trusty

addons:
chrome: stable

cache:
directories:
Expand All @@ -14,7 +18,6 @@ cache:
env:
# we recommend new addons test the current and previous LTS
# as well as latest stable release (bonus points to beta/canary)
- EMBER_TRY_SCENARIO=ember-lts-2.4
- EMBER_TRY_SCENARIO=ember-lts-2.8
- EMBER_TRY_SCENARIO=ember-lts-2.12
- EMBER_TRY_SCENARIO=ember-release
Expand All @@ -31,11 +34,6 @@ before_install:
- npm config set spin false
- npm install -g npm@4
- npm --version
- npm install -g phantomjs-prebuilt
- phantomjs --version

install:
- npm install

script:
# Usually, it's ok to finish the test scenario without reverting
Expand Down
76 changes: 0 additions & 76 deletions addon/-private/column.js

This file was deleted.

18 changes: 0 additions & 18 deletions addon/components/models-select.js

This file was deleted.

0 comments on commit 9ab0c68

Please sign in to comment.