New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUGFIX release] Revert the reverted revert. Ember assign not available in all ember try scenarios #6496

Merged
merged 1 commit into from Dec 1, 2016
Jump to file or symbol
Failed to load files and symbols.
+2 −2
Diff settings

Always

Just for now

Revert "Revert "Revert "Changed the start-app test helper to use `Emb…

…er.assign` instead of `Ember.merge`."""

This reverts commit 7b282ae.
  • Loading branch information...
webark committed Dec 1, 2016
commit 4b8a23a5cbdfe4d24fa35d69694519112ec9ff66
@@ -5,8 +5,8 @@ import config from '../../config/environment';
export default function startApp(attrs) {
let application;
// use defaults, but you can override
let attributes = Ember.assign({}, config.APP, attrs);
let attributes = Ember.merge({}, config.APP);
attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
Ember.run(() => {
application = Application.create(attributes);
ProTip! Use n and p to navigate between commits in a pull request.