From 8c654ec91f92d0005a842cc2c308cae3ce4764e7 Mon Sep 17 00:00:00 2001 From: Godhuda Date: Mon, 11 Apr 2016 11:41:25 -0700 Subject: [PATCH] [BUGFIX beta] Add URL for Ember.merge deprecation --- packages/ember-metal/lib/merge.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/ember-metal/lib/merge.js b/packages/ember-metal/lib/merge.js index 5747c94b6df..fbc2132227e 100644 --- a/packages/ember-metal/lib/merge.js +++ b/packages/ember-metal/lib/merge.js @@ -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') {