-
-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into compute-active
- Loading branch information
Showing
262 changed files
with
11,514 additions
and
10,816 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 2.15.0.alpha.1 | ||
| 2.17.0.alpha.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| import Ember from 'ember'; | ||
| import Component from '@ember/component'; | ||
| <%= importTemplate %> | ||
| export default Ember.Component.extend({<%= contents %> | ||
| export default Component.extend({<%= contents %> | ||
| }); |
2 changes: 1 addition & 1 deletion
2
blueprints/component/files/__root__/__templatepath__/__templatename__.hbs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| {{yield}} | ||
| {{yield}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| import Ember from 'ember'; | ||
| import Controller from '@ember/controller'; | ||
|
|
||
| export default Ember.Controller.extend({ | ||
| export default Controller.extend({ | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| import Ember from 'ember'; | ||
| import { helper } from '@ember/component/helper'; | ||
|
|
||
| export function <%= camelizedModuleName %>(params/*, hash*/) { | ||
| return params; | ||
| } | ||
|
|
||
| export default Ember.Helper.helper(<%= camelizedModuleName %>); | ||
| export default helper(<%= camelizedModuleName %>); |
7 changes: 4 additions & 3 deletions
7
blueprints/initializer-test/mocha-files/tests/unit/initializers/__name__-test.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 5 additions & 3 deletions
8
blueprints/initializer-test/qunit-files/tests/unit/initializers/__name__-test.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 5 additions & 4 deletions
9
...s/instance-initializer-test/mocha-files/tests/unit/instance-initializers/__name__-test.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 5 additions & 4 deletions
9
...s/instance-initializer-test/qunit-files/tests/unit/instance-initializers/__name__-test.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
blueprints/mixin-test/mocha-files/tests/unit/mixins/__name__-test.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
blueprints/mixin-test/qunit-files/tests/unit/mixins/__name__-test.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| import Ember from 'ember'; | ||
| import EmberObject from '@ember/object'; | ||
| import <%= classifiedModuleName %>Mixin from '<%= projectName %>/mixins/<%= dasherizedModuleName %>'; | ||
| import { module, test } from 'qunit'; | ||
|
|
||
| module('<%= friendlyTestName %>'); | ||
|
|
||
| // Replace this with your real tests. | ||
| test('it works', function(assert) { | ||
| let <%= classifiedModuleName %>Object = Ember.Object.extend(<%= classifiedModuleName %>Mixin); | ||
| let <%= classifiedModuleName %>Object = EmberObject.extend(<%= classifiedModuleName %>Mixin); | ||
| let subject = <%= classifiedModuleName %>Object.create(); | ||
| assert.ok(subject); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| import Ember from 'ember'; | ||
| import Mixin from '@ember/object/mixin'; | ||
|
|
||
| export default Ember.Mixin.create({ | ||
| export default Mixin.create({ | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| import Ember from 'ember'; | ||
| import Route from '@ember/routing/route'; | ||
|
|
||
| export default Ember.Route.extend({ | ||
| export default Route.extend({ | ||
| }); |
2 changes: 1 addition & 1 deletion
2
blueprints/route/files/__root__/__templatepath__/__templatename__.hbs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| {{outlet}} | ||
| {{outlet}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| import Ember from 'ember'; | ||
| import Service from '@ember/service'; | ||
|
|
||
| export default Ember.Service.extend({ | ||
| export default Service.extend({ | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| import Ember from 'ember'; | ||
| import { registerAsyncHelper } from '@ember/test'; | ||
|
|
||
| export default Ember.Test.registerAsyncHelper('<%= camelizedModuleName %>', function(app) { | ||
| export default registerAsyncHelper('<%= camelizedModuleName %>', function(app) { | ||
|
|
||
| }); |
Oops, something went wrong.