From 1c79810030e5656738daa3727350ad0e8c4b8ce6 Mon Sep 17 00:00:00 2001 From: Ryunosuke SATO Date: Tue, 4 Aug 2015 23:20:43 +0900 Subject: [PATCH] [DOC release] Mark `Ember.merge` as public There are no alternative way to `Ember.merge` in Ember world. But it is useful and widely used from other library. For example: * Ember Data: https://github.com/emberjs/data/blob/v1.13.7/packages/ember-data/lib/core.js#L29 * Liquid Fire: https://github.com/ef4/liquid-fire/blob/v0.21.0/app/transitions/scroll-then.js#L19 So this method may be public until `Object.assign` can be used natively. --- packages/ember-metal/lib/merge.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ember-metal/lib/merge.js b/packages/ember-metal/lib/merge.js index 4b8a086abf9..688d5fba9ba 100644 --- a/packages/ember-metal/lib/merge.js +++ b/packages/ember-metal/lib/merge.js @@ -13,7 +13,7 @@ @param {Object} original The object to merge into @param {Object} updates The object to copy properties from @return {Object} - @private + @public */ export default function merge(original, updates) { if (!updates || typeof updates !== 'object') {