Skip to content
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

Use assign instead of deprecated merge #410

Merged
merged 2 commits into from
Sep 27, 2018

Conversation

wagenet
Copy link
Member

@wagenet wagenet commented Sep 11, 2018

No description provided.

@wagenet
Copy link
Member Author

wagenet commented Sep 11, 2018

@cibernox doesn't look like the failing test is my fault, but can you verify?

@rwjblue
Copy link
Member

rwjblue commented Sep 12, 2018

No, we need to remove ^ from ember-try in package.json

@wagenet
Copy link
Member Author

wagenet commented Sep 12, 2018

So is this good to merge?

Copy link
Member

@rwjblue rwjblue left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for working on this! Can you:

  • rebase (CI should be green now)
  • add ember-assign-polyfill as a dependency (the removal of falling back to Ember.merge in the legacy-0-6-x paths would be a breaking change otherwise)

wagenet and others added 2 commits September 27, 2018 10:55
Unfortunately, had to use `~2.4.0` because 2.5.0 dropped Node 4 support.
@rwjblue
Copy link
Member

rwjblue commented Sep 27, 2018

Rebased and updated to add ember-assign-polyfill as a dependency.

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

Successfully merging this pull request may close these issues.

None yet

3 participants