ember-cli 1.13.8 -> 1.13.14

[john-kurkowski]

Accept ember init's output, except for ember-infinity-specific dependencies.

Acquires all the goodies and bugfixes in the last few releases of ember-cli.

[john-kurkowski]

The only output of ember init I wasn't sure about was config/ember-try.js. I'm not familiar with that file. So I left it alone. Patch:

diff --git a/config/ember-try.js b/config/ember-try.js
index 85cbad5..3e88bc6 100644
--- a/config/ember-try.js
+++ b/config/ember-try.js
@@ -6,67 +6,30 @@ module.exports = {
       dependencies: { }
     },
     {
-      name: 'ember-1.10',
-      dependencies: {
-        ember: '~1.10.0',
-        'ember-data': '1.13.10'
-      }
-    },
-    {
-      name: 'ember-1.11',
-      dependencies: {
-        ember: '~1.11.3',
-        'ember-data': '1.13.10'
-      }
-    },
-    {
-      name: 'ember-1.12',
-      dependencies: {
-        ember: '~1.12.0'
-      }
-    },
-    {
-      name: 'ember-1.13',
-      dependencies: {
-        ember: '~1.13.0'
-      }
-    },
-    {
       name: 'ember-release',
       dependencies: {
-        ember: 'release',
-        'ember-data': 'release'
-      }
-    },
-    {
-      name: 'ember-release-ember-data-1.13.1x',
-      dependencies: {
-        ember: 'release',
-        'ember-data': '~1.13.11'
+        'ember': 'components/ember#release'
       },
       resolutions: {
-        ember: 'release',
-        'ember-data': '~1.13.11'
+        'ember': 'release'
       }
     },
     {
       name: 'ember-beta',
       dependencies: {
-        ember: 'beta',
-        'ember-data': 'beta'
+        'ember': 'components/ember#beta'
       },
       resolutions: {
-        ember: 'beta'
+        'ember': 'beta'
       }
     },
     {
       name: 'ember-canary',
       dependencies: {
-        ember: 'canary',
-        'ember-data': 'canary'
+        'ember': 'components/ember#canary'
       },
       resolutions: {
-        ember: 'canary'
+        'ember': 'canary'
       }
     }
   ]

[hhff]

can we keep .DS_Store in here plz

[john-kurkowski]

Shouldn't that be in your global .gitignore? To keep this .gitignore focused on ember-infinity. And so you don't have to add your personal ignores to every project you work on.

[kellyselden]

@john-kurkowski I would agree, since this wouldn't affect Linux or Windows users.

[john-kurkowski]

Er, was that a vote for keeping .DS_Store in this file or removing it? 😄 Up to you both.

[kellyselden]

Haha sorry, I'm in favor of removing it from the file.

[hhff]

fair shake! agree'd

[hhff]

@john-kurkowski can we merge master here please!

[john-kurkowski]

Rebased to fix conflict.

[hhff]

Ahh sorry @john-kurkowski - missed this

THANKYOU