Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Exelord committed Jul 5, 2018
1 parent 0e97ef6 commit 64eae43
Show file tree
Hide file tree
Showing 8 changed files with 4,678 additions and 4,969 deletions.
17 changes: 16 additions & 1 deletion .eslintignore
@@ -1 +1,16 @@
/blueprints/*/files/**/*.js
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/coverage/

# ember-try
/.node_modules.ember-try/
25 changes: 11 additions & 14 deletions .gitignore
@@ -1,26 +1,23 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/dist/
/tmp/

# dependencies
/node_modules
/bower_components
/bower_components/
/node_modules/

# misc
/.sass-cache
/connect.lock
/coverage/*
/coverage/
/libpeerconnection.log
npm-debug.log*
yarn-error.log
testem.log
/npm-debug.log*
/testem.log
/yarn-error.log

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
View

.DS_Store
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
6 changes: 6 additions & 0 deletions .npmignore
Expand Up @@ -14,3 +14,9 @@
bower.json
ember-cli-build.js
testem.js
yarn.lock

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -3,7 +3,7 @@ language: node_js
node_js:
# we recommend testing addons with the same minimum supported node version as Ember CLI
# so that your addon works for all apps
- "4"
- "6"

sudo: false
dist: trusty
Expand Down
3 changes: 3 additions & 0 deletions ember-cli-build.js
Expand Up @@ -12,6 +12,9 @@ module.exports = function(defaults) {
pretender: {
enabled: true
},
'ember-bootstrap': {
bootstrapVersion: 3
},
favicons: {
faviconsConfig: {
appName: 'Ember Custom Actions',
Expand Down

0 comments on commit 64eae43

Please sign in to comment.