From c393f0e4170f38c9c012b958543415ed6956e331 Mon Sep 17 00:00:00 2001
From: Blake Gentry <bgentry@users.noreply.github.com>
Date: Wed, 25 Jul 2018 11:12:17 -0700
Subject: [PATCH] replace Ember.copy, merge w/ Object.assign (#835)

---
 app/libs/promise-assembler.js         | 3 +--
 app/libs/resizable-columns.js         | 4 +---
 ember_debug/libs/promise-assembler.js | 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/libs/promise-assembler.js b/app/libs/promise-assembler.js
index 6a500b3b00..f70c449366 100644
--- a/app/libs/promise-assembler.js
+++ b/app/libs/promise-assembler.js
@@ -1,5 +1,4 @@
 import { assert } from '@ember/debug';
-import { copy } from '@ember/object/internals';
 import { later } from '@ember/runloop';
 import EmberObject, { computed } from '@ember/object';
 import EventedMixin from '@ember/object/evented';
@@ -68,7 +67,7 @@ export default EmberObject.extend(EventedMixin, {
 
   rebuildPromises(promises) {
     promises.forEach(props => {
-      props = copy(props);
+      props = Object.assign({}, props);
       let childrenIds = props.children;
       let parentId = props.parent;
       delete props.children;
diff --git a/app/libs/resizable-columns.js b/app/libs/resizable-columns.js
index d5811272ec..57b952da84 100644
--- a/app/libs/resizable-columns.js
+++ b/app/libs/resizable-columns.js
@@ -7,8 +7,6 @@
 import { set } from '@ember/object';
 
 import { isNone } from '@ember/utils';
-import { copy } from '@ember/object/internals';
-import { merge } from '@ember/polyfills';
 import compareArrays from 'ember-inspector/utils/compare-arrays';
 
 const { floor } = Math;
@@ -193,7 +191,7 @@ export default class {
     if (this._columnVisibility) {
       return this._columnVisibility;
     }
-    this._columnVisibility = this.columnSchema.map(column => merge(copy(column), {
+    this._columnVisibility = this.columnSchema.map(column => Object.assign({}, column, {
       visible: this.isColumnVisible(column.id)
     }));
   }
diff --git a/ember_debug/libs/promise-assembler.js b/ember_debug/libs/promise-assembler.js
index cd31b4d050..a88a1e1d25 100644
--- a/ember_debug/libs/promise-assembler.js
+++ b/ember_debug/libs/promise-assembler.js
@@ -7,7 +7,7 @@
 
 import Promise from 'ember-debug/models/promise';
 const Ember = window.Ember;
-const { Object: EmberObject, Evented, A, computed, RSVP, copy, isNone } = Ember;
+const { Object: EmberObject, Evented, A, computed, RSVP, isNone } = Ember;
 
 let PromiseAssembler = EmberObject.extend(Evented, {
   // RSVP lib to debug
@@ -95,7 +95,7 @@ let PromiseAssembler = EmberObject.extend(Evented, {
     if (entry) {
       entry.setProperties(properties);
     } else {
-      properties = copy(properties);
+      properties = Object.assign({}, properties);
       properties.guid = guid;
       entry = this.createPromise(properties);
     }