From d89b8eb327123cf3340b07b5e1fd24025b041d31 Mon Sep 17 00:00:00 2001
From: Vincent Hellot <hellvinz@gmail.com>
Date: Fri, 20 Nov 2015 13:05:34 +0100
Subject: [PATCH] fix registry.resolve deprecation

see:
http://emberjs.com/deprecations/v2.x/#toc_ember-application-registry-ember-applicationinstance-registry
---
 ember_debug/data-debug.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ember_debug/data-debug.js b/ember_debug/data-debug.js
index a421af6f75..bc53d818d7 100644
--- 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);
     }