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

Conversation

Projects
None yet
5 participants
@webark
Contributor

webark commented Dec 1, 2016

Changing the start-app test helper to use Ember.assign instead of Ember.merge. Broke ember try as Ember 2.4 apparently doesn't have Ember.assign. Need to revert back to using the Ember.merge for now.

This reverts commit 7b282ae.

Revert "Revert "Revert "Changed the start-app test helper to use `Emb…
…er.assign` instead of `Ember.merge`."""

This reverts commit 7b282ae.

@nathanhammond nathanhammond changed the title from BUGFIX Revert the reverted revert. Ember assign not available in all ember try scenarios to [BUGFIX release] Revert the reverted revert. Ember assign not available in all ember try scenarios Dec 1, 2016

@nathanhammond nathanhammond merged commit 3ecf2e6 into ember-cli:release Dec 1, 2016

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage remained the same at 92.907%
Details

@webark webark deleted the webark:revert-ember-assign-test-helper branch Dec 1, 2016

@Turbo87 Turbo87 added this to the v2.11.0 milestone Dec 4, 2016

@kellyselden

This comment has been minimized.

Show comment
Hide comment
@kellyselden

kellyselden Dec 4, 2016

Member

This should released in a v2.10.1. Just came across this.

Member

kellyselden commented Dec 4, 2016

This should released in a v2.10.1. Just came across this.

@kellyselden kellyselden modified the milestones: v2.10.1, v2.11.0 Dec 4, 2016

@kellyselden kellyselden referenced this pull request Dec 4, 2016

Merged

ember-cli@2.10.0 #159

@rwjblue

This comment has been minimized.

Show comment
Hide comment
@rwjblue

rwjblue Dec 4, 2016

Contributor

Yep, is already on release branch and will be included in 2.10.1 when it is released.

Contributor

rwjblue commented Dec 4, 2016

Yep, is already on release branch and will be included in 2.10.1 when it is released.

@nathanhammond

This comment has been minimized.

Show comment
Hide comment
@nathanhammond

nathanhammond Dec 5, 2016

Contributor

Monday.

Contributor

nathanhammond commented Dec 5, 2016

Monday.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment