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 Ember.merge instead of ember-data's shim #4078

Merged
merged 1 commit into from
Jan 15, 2016

Conversation

tricknotes
Copy link
Member

This shim was introduced to be compatible with old Ember
that couldn't merge object that has no hasOwnProperty method.
#2506

However current Ember Data supports Ember >= 2 (it can merge objects
safely since this change. emberjs/ember.js@751f76dac )
emberjs/ember.js#5645

So now this shim is unnecessary.

This shim was introduced to compatible with old Ember
that couldn't merge object that has no `hasOwnProperty` method.
emberjs#2506

However current Ember Data supports Ember >= 2 (it can merge objects
safely since this change. 751f76dac )
emberjs/ember.js#5645

So now this shim is unnecessary.
@wecc
Copy link
Contributor

wecc commented Jan 14, 2016

LGTM 👍

@igorT, @fivetanley ?

@stefanpenner
Copy link
Member

LGTM

bmac added a commit that referenced this pull request Jan 15, 2016
Use `Ember.merge` instead of ember-data's shim
@bmac bmac merged commit 266ae62 into emberjs:master Jan 15, 2016
@tricknotes tricknotes deleted the use-ember-merge branch January 15, 2016 01:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants