Skip to content
This repository was archived by the owner on Nov 6, 2018. It is now read-only.

Commit 7d43252

Browse files
committed
Merge branch 'release/v1.5.1'
* release/v1.5.1: Upgraded to v3.3.0 Upgraded to v3.2.0 Upgraded to v3.1.3
2 parents 3295220 + af120f8 commit 7d43252

File tree

6 files changed

+1679
-2866
lines changed

6 files changed

+1679
-2866
lines changed

.eslintignore

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# unconventional js
2+
/blueprints/*/files/
3+
/vendor/
4+
5+
# compiled output
6+
/dist/
7+
/tmp/
8+
9+
# dependencies
10+
/bower_components/
11+
12+
# misc
13+
/coverage/
14+
15+
# ember-try
16+
/.node_modules.ember-try/

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ module.exports = {
2222
files: [
2323
'ember-cli-build.js',
2424
'testem.js',
25+
'blueprints/*/index.js',
2526
'config/**/*.js',
2627
'lib/*/index.js'
2728
],

.gitignore

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
11
# See https://help.github.com/ignore-files/ for more about ignoring files.
22

33
# compiled output
4-
/dist
5-
/tmp
4+
/dist/
5+
/tmp/
66

77
# dependencies
8-
/node_modules
9-
/bower_components
8+
/bower_components/
9+
/node_modules/
1010

1111
# misc
1212
/.sass-cache
1313
/connect.lock
14-
/coverage/*
14+
/coverage/
1515
/libpeerconnection.log
16-
npm-debug.log*
17-
yarn-error.log
18-
testem.log
19-
secret.json
16+
/npm-debug.log*
17+
/testem.log
18+
/yarn-error.log
2019

2120
# ember-try
22-
.node_modules.ember-try/
23-
bower.json.ember-try
24-
package.json.ember-try
21+
/.node_modules.ember-try/
22+
/bower.json.ember-try
23+
/package.json.ember-try

0 commit comments

Comments
 (0)