Merge pull request #13344 from rwjblue/remove-merge-deprecation

[BUGFIX release] Remove Ember.merge deprecation.
emberjs · Apr 15, 2016 · 75cd6e3 · 75cd6e3
2 parents 4f4bc17 + 201b8dd
commit 75cd6e3
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 21 deletions.
diff --git a/packages/ember-metal/lib/merge.js b/packages/ember-metal/lib/merge.js
@@ -1,6 +1,3 @@
-import { deprecate } from 'ember-metal/debug';
-import isEnabled from 'ember-metal/features';
-
 /**
   Merge the contents of two objects together into the first object.
 
@@ -19,12 +16,6 @@ import isEnabled from 'ember-metal/features';
   @public
 */
 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', url: 'http://emberjs.com/deprecations/v2.x/#toc_ember-merge'
-    });
-  }
-
   if (!updates || typeof updates !== 'object') {
     return original;
   }

diff --git a/packages/ember-metal/tests/merge_test.js b/packages/ember-metal/tests/merge_test.js