From 201b8dd193954863ab78981c72dd1d5259646a89 Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Fri, 15 Apr 2016 15:33:09 -0400 Subject: [PATCH] [BUGFIX release] Remove Ember.merge deprecation. The deprecation was too noisy, and not enough libraries updated prior to release (to avoid deprecation). At this point the deprecation is just a nuisance to our users. --- packages/ember-metal/lib/merge.js | 9 --------- packages/ember-metal/tests/merge_test.js | 12 ------------ 2 files changed, 21 deletions(-) delete mode 100644 packages/ember-metal/tests/merge_test.js diff --git a/packages/ember-metal/lib/merge.js b/packages/ember-metal/lib/merge.js index fbc2132227e..688d5fba9ba 100644 --- 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 deleted file mode 100644 index 7c874baeab7..00000000000 --- a/packages/ember-metal/tests/merge_test.js +++ /dev/null @@ -1,12 +0,0 @@ -import merge from 'ember-metal/merge'; -import isEnabled from 'ember-metal/features'; - -QUnit.module('Ember.merge'); - -if (isEnabled('ember-metal-ember-assign')) { - QUnit.test('Ember.merge should be deprecated', function() { - expectDeprecation(function() { - merge({ a: 1 }, { b: 2 }); - }, 'Usage of `Ember.merge` is deprecated, use `Ember.assign` instead.'); - }); -}