dist/ember-template-compiler.js in ember-source-2.5.0 vs dist/ember-template-compiler.js in ember-source-2.5.1

@@ -4,11 +4,11 @@
  * @copyright Copyright 2011-2016 Tilde Inc. and contributors
  *            Portions Copyright 2006-2011 Strobe Inc.
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   2.5.0
+ * @version   2.5.1
  */
 
 var enifed, requireModule, require, requirejs, Ember;
 var mainContext = this;
 
@@ -3978,11 +3978,11 @@
     cross-platform libraries such as jQuery. For more details, see
     [Ember-Runtime](http://emberjs.com/api/modules/ember-runtime.html).
   
     @class Ember
     @static
-    @version 2.5.0
+    @version 2.5.1
     @public
   */
 
   if ('undefined' === typeof Ember) {
     // Create core object. Make it act like an instance of Ember.Namespace so that
@@ -4020,15 +4020,15 @@
   /**
     The semantic version.
   
     @property VERSION
     @type String
-    @default '2.5.0'
+    @default '2.5.1'
     @static
     @public
   */
-  Ember.VERSION = '2.5.0';
+  Ember.VERSION = '2.5.1';
 
   /**
     The hash of environment variables used to control various configuration
     settings. To specify your own or override default settings, add the
     desired properties to a global hash named `EmberENV` (or `ENV` for
@@ -5160,11 +5160,11 @@
     AliasedPropertyPrototype.oneWay.call(this);
   }
 
   function injectedPropertyGet(keyName) {
     var desc = this[keyName];
-    var owner = _containerOwner.getOwner(this);
+    var owner = _containerOwner.getOwner(this) || this.container; // fallback to `container` for backwards compat
 
     _emberMetalDebug.assert('InjectedProperties should be defined with the Ember.inject computed property macros.', desc && desc.isDescriptor && desc.type);
     _emberMetalDebug.assert('Attempting to lookup an injected property on an object without a container, ensure that the object was instantiated via a container.', owner);
 
     return owner.lookup(desc.type + ':' + (desc.name || keyName));
@@ -6308,15 +6308,11 @@
   exports.default = Map;
   exports.OrderedSet = OrderedSet;
   exports.Map = Map;
   exports.MapWithDefault = MapWithDefault;
 });
-enifed('ember-metal/merge', ['exports', 'ember-metal/debug', 'ember-metal/features'], function (exports, _emberMetalDebug, _emberMetalFeatures) {
-  'use strict';
-
-  exports.default = merge;
-
+enifed('ember-metal/merge', ['exports'], function (exports) {
   /**
     Merge the contents of two objects together into the first object.
   
     ```javascript
     Ember.merge({first: 'Tom'}, {last: 'Dale'}); // {first: 'Tom', last: 'Dale'}
@@ -6330,16 +6326,15 @@
     @param {Object} original The object to merge into
     @param {Object} updates The object to copy properties from
     @return {Object}
     @public
   */
+  'use strict';
 
-  function merge(original, updates) {
-    _emberMetalDebug.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'
-    });
+  exports.default = merge;
 
+  function merge(original, updates) {
     if (!updates || typeof updates !== 'object') {
       return original;
     }
 
     var props = Object.keys(updates);
@@ -12752,10 +12747,10 @@
     options.plugins = plugins;
 
     options.buildMeta = function buildMeta(program) {
       return {
         fragmentReason: fragmentReason(program),
-        revision: 'Ember@2.5.0',
+        revision: 'Ember@2.5.1',
         loc: program.loc,
         moduleName: options.moduleName
       };
     };
 
\ No newline at end of file