fix deprecation Ember.merge for 2.5.0 #148
Merged
Conversation
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
|
I don't think our tests cover 2.5.0 beta or at least I can't see the deprecation anywhere on Travis, but this seems like a small enough change to accept. @eluciano11 thoughts? |
|
No, currently we don't cover the |
|
@homu r+ |
|
📌 Commit 4b0a00b has been approved by |
homu
added a commit
that referenced
this pull request
Mar 30, 2016
fix deprecation Ember.merge for 2.5.0 DEPRECATION: Usage of `Ember.merge` is deprecated, use `Ember.assign` instead. [deprecation id: ember-metal.merge] More info: emberjs/ember.js#12303 Setup: ``` Ember : 2.5.0-beta.3 Ember Data : 2.5.0-beta.3 jQuery : 2.2.1 Ember Simple Auth : 1.1.0-beta.3 ```
|
☀️ Test successful - status |
|
@gertjanwytynck Thank you for your contribution!! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
DEPRECATION: Usage of
Ember.mergeis deprecated, useEmber.assigninstead. [deprecation id: ember-metal.merge]More info: emberjs/ember.js#12303
Setup: