Skip to content

Commit

Permalink
[BUGFIX beta] Add URL for Ember.merge deprecation
Browse files Browse the repository at this point in the history
  • Loading branch information
Godhuda committed Apr 11, 2016
1 parent b418b95 commit 8c654ec
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion packages/ember-metal/lib/merge.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ import isEnabled from 'ember-metal/features';
*/
export default function merge(original, updates) {
if (isEnabled('ember-metal-ember-assign')) {
deprecate('Usage of `Ember.merge` is deprecated, use `Ember.assign` instead.', false, { id: 'ember-metal.merge', until: '3.0.0' });
deprecate('Usage of `Ember.merge` is deprecated, use `Ember.assign` instead.', false, {
id: 'ember-metal.merge', until: '3.0.0', url: 'http://emberjs.com/deprecations/v2.x/#toc_ember-merge'
});
}

if (!updates || typeof updates !== 'object') {
Expand Down

0 comments on commit 8c654ec

Please sign in to comment.