Merge pull request #15922 from thoov/legacy-controller-proxy

[CLEANUP] Remove legacy controller proxy behavior
emberjs · Dec 7, 2017 · 467ba80 · 467ba80
2 parents 360d1a7 + 82c0684
commit 467ba80
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/packages/ember-runtime/lib/mixins/-proxy.js b/packages/ember-runtime/lib/mixins/-proxy.js
@@ -105,11 +105,6 @@ export default Mixin.create({
   unknownProperty(key) {
     let content = get(this, 'content');
     if (content) {
-      deprecate(
-        `You attempted to access \`${key}\` from \`${this}\`, but object proxying is deprecated. Please use \`model.${key}\` instead.`,
-        !this.isController,
-        { id: 'ember-runtime.controller-proxy', until: '3.0.0' }
-      );
       return get(content, key);
     }
   },
@@ -127,12 +122,6 @@ export default Mixin.create({
     let content = get(this, 'content');
     assert(`Cannot delegate set('${key}', ${value}) to the \'content\' property of object proxy ${this}: its 'content' is undefined.`, content);
 
-    deprecate(
-      `You attempted to set \`${key}\` from \`${this}\`, but object proxying is deprecated. Please use \`model.${key}\` instead.`,
-      !this.isController,
-      { id: 'ember-runtime.controller-proxy', until: '3.0.0' }
-    );
-
     return set(content, key, value);
   }
 });