Merge pull request #497 from hellvinz/master

fix registry.resolve deprecation
emberjs · Nov 20, 2015 · 1b32240 · 1b32240
2 parents 13b6496 + d89b8eb
commit 1b32240
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/ember_debug/data-debug.js b/ember_debug/data-debug.js
@@ -33,8 +33,11 @@ export default EmberObject.extend(PortMixin, {
     } else if (container.resolve) {
       // Ember < 1.11
       return container.resolve(name);
+    } else if (container.resolveRegistration) {
+      // Ember >= 2.1
+      return container.resolveRegistration(name);
     } else {
-      // Ember >= 2.0
+      // Ember >= 2.0 < 2.1
       return container.registry.resolve(name);
     }