From fa56ba89a54a04b82aa260925019f722e609ca9e Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <markvanlan@gmail.com>
Date: Mon, 4 Nov 2019 09:56:16 -0600
Subject: [PATCH] Import getProperties from @ember/object

---
 .../javascripts/admin/routes/admin-site-text-index.js.es6      | 3 ++-
 app/assets/javascripts/discourse-loader.js                     | 3 ++-
 app/assets/javascripts/discourse/models/user.js.es6            | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/admin/routes/admin-site-text-index.js.es6 b/app/assets/javascripts/admin/routes/admin-site-text-index.js.es6
index 2c0e365322e..815dd1c0842 100644
--- a/app/assets/javascripts/admin/routes/admin-site-text-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-site-text-index.js.es6
@@ -1,5 +1,6 @@
 import Route from "@ember/routing/route";
 import showModal from "discourse/lib/show-modal";
+import { getProperties } from "@ember/object";
 
 export default Route.extend({
   queryParams: {
@@ -10,7 +11,7 @@ export default Route.extend({
   model(params) {
     return this.store.find(
       "site-text",
-      Ember.getProperties(params, "q", "overridden")
+      getProperties(params, "q", "overridden")
     );
   },
 
diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 199f6374a90..d6f2171dd79 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -13,7 +13,8 @@ var define, requirejs;
       },
       "@ember/object": {
         default: Ember.Object,
-        get: Ember.get
+        get: Ember.get,
+        getProperties: Ember.getProperties
       },
       "@ember/object/computed": {
         default: Ember.computed,
diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6
index b3148b4c0cc..6ce6bf90cdd 100644
--- a/app/assets/javascripts/discourse/models/user.js.es6
+++ b/app/assets/javascripts/discourse/models/user.js.es6
@@ -23,6 +23,7 @@ import PreloadStore from "preload-store";
 import { defaultHomepage } from "discourse/lib/utilities";
 import { userPath } from "discourse/lib/url";
 import Category from "discourse/models/category";
+import { getProperties } from "@ember/object";
 
 export const SECOND_FACTOR_METHODS = {
   TOTP: 1,
@@ -350,7 +351,7 @@ const User = RestModel.extend({
     })
       .then(result => {
         this.set("bio_excerpt", result.user.bio_excerpt);
-        const userProps = Ember.getProperties(
+        const userProps = getProperties(
           this.user_option,
           "enable_quoting",
           "enable_defer",