FIX: computed is part of `@ember/object` not `@ember/object/computed`

app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6

@@ -6,7 +6,7 @@ import { setting } from "discourse/lib/computed";
 import AdminDashboard from "admin/models/admin-dashboard";
 import Report from "admin/models/report";
 import PeriodComputationMixin from "admin/mixins/period-computation";
-import computed from "@ember/object/computed";
+import { computed } from "@ember/object";
 
 function staticReport(reportType) {
   return computed("reports.[]", function() {

app/assets/javascripts/admin/models/api-key.js.es6

@@ -2,7 +2,7 @@ import discourseComputed from "discourse-common/utils/decorators";
 import AdminUser from "admin/models/admin-user";
 import RestModel from "discourse/models/rest";
 import { ajax } from "discourse/lib/ajax";
-import computed from "@ember/object/computed";
+import { computed } from "@ember/object";
 
 const ApiKey = RestModel.extend({
   user: computed("_user", {

app/assets/javascripts/discourse-loader.js

@@ -20,10 +20,10 @@ var define, requirejs;
         get: Ember.get,
         getProperties: Ember.getProperties,
         set: Ember.set,
-        setProperties: Ember.setProperties
+        setProperties: Ember.setProperties,
+        computed: Ember.computed
       },
       "@ember/object/computed": {
-        default: Ember.computed,
         alias: Ember.computed.alias,
         and: Ember.computed.and,
         bool: Ember.computed.bool,

app/assets/javascripts/discourse.js.es6

@@ -4,7 +4,7 @@ import {
   default as discourseComputed,
   observes
 } from "discourse-common/utils/decorators";
-import computed from "@ember/object/computed";
+import { computed } from "@ember/object";
 import FocusEvent from "discourse-common/mixins/focus-event";
 import EmberObject from "@ember/object";
 import deprecated from "discourse-common/lib/deprecated";

app/assets/javascripts/discourse/components/about-page-users.js.es6

@@ -3,7 +3,7 @@ import { userPath } from "discourse/lib/url";
 import { formatUsername, escapeExpression } from "discourse/lib/utilities";
 import { normalize } from "discourse/components/user-info";
 import { renderAvatar } from "discourse/helpers/user-avatar";
-import computed from "@ember/object/computed";
+import { computed } from "@ember/object";
 
 export default Component.extend({
   usersTemplates: computed("users.[]", function() {

app/assets/javascripts/discourse/components/date-time-input.js.es6

@@ -1,5 +1,5 @@
 import Component from "@ember/component";
-import computed from "@ember/object/computed";
+import { computed } from "@ember/object";
 
 export default Component.extend({
   classNames: ["d-date-time-input"],

app/assets/javascripts/discourse/controllers/composer.js.es6

@@ -1,11 +1,5 @@
 import { isEmpty } from "@ember/utils";
-import {
+import { and, or, alias, reads } from "@ember/object/computed";
-  default as computed,
-  and,
-  or,
-  alias,
-  reads
-} from "@ember/object/computed";
 import { debounce } from "@ember/runloop";
 import { inject as service } from "@ember/service";
 import { inject } from "@ember/controller";
@@ -31,7 +25,7 @@ import { shortDate } from "discourse/lib/formatter";
 import { SAVE_LABELS, SAVE_ICONS } from "discourse/models/composer";
 import { Promise } from "rsvp";
 import ENV from "discourse-common/config/environment";
-import EmberObject from "@ember/object";
+import EmberObject, { computed } from "@ember/object";
 
 function loadDraft(store, opts) {
   opts = opts || {};

app/assets/javascripts/discourse/controllers/history.js.es6

@@ -1,12 +1,5 @@
 import discourseComputed from "discourse-common/utils/decorators";
-import {
+import { alias, gt, not, or, equal } from "@ember/object/computed";
-  default as computed,
-  alias,
-  gt,
-  not,
-  or,
-  equal
-} from "@ember/object/computed";
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { categoryBadgeHTML } from "discourse/helpers/category-link";
@@ -16,6 +9,7 @@ import { sanitizeAsync } from "discourse/lib/text";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import Post from "discourse/models/post";
 import Category from "discourse/models/category";
+import computed from "@ember/object";
 
 function customTagArray(fieldName) {
   return computed(fieldName, function() {

app/assets/javascripts/discourse/lib/register-topic-footer-button.js.es6

@@ -1,5 +1,5 @@
 import error from "@ember/error";
-import computed from "@ember/object/computed";
+import { computed } from "@ember/object";
 
 let _topicFooterButtons = {};
 

app/assets/javascripts/discourse/mixins/buffered-content.js.es6

@@ -1,6 +1,6 @@
 import EmberObjectProxy from "@ember/object/proxy";
 import Mixin from "@ember/object/mixin";
-import computed from "@ember/object/computed";
+import { computed } from "@ember/object";
 
 /* global BufferedProxy: true */
 export function bufferedProperty(property) {

app/assets/javascripts/discourse/models/post.js.es6

@@ -1,13 +1,7 @@
 import discourseComputed from "discourse-common/utils/decorators";
-import { get } from "@ember/object";
+import { computed, get } from "@ember/object";
 import { isEmpty } from "@ember/utils";
-import {
+import { equal, and, or, not } from "@ember/object/computed";
-  default as computed,
-  equal,
-  and,
-  or,
-  not
-} from "@ember/object/computed";
 import EmberObject from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import RestModel from "discourse/models/rest";

app/assets/javascripts/discourse/models/user.js.es6

@@ -1,6 +1,6 @@
 import { isEmpty } from "@ember/utils";
-import { default as computed, gt, equal, or } from "@ember/object/computed";
+import { gt, equal, or } from "@ember/object/computed";
-import EmberObject from "@ember/object";
+import EmberObject, { computed } from "@ember/object";
 import { ajax } from "discourse/lib/ajax";
 import { url } from "discourse/lib/computed";
 import RestModel from "discourse/models/rest";

app/assets/javascripts/discourse/widgets/post-small-action.js.es6

@@ -5,7 +5,7 @@ import { h } from "virtual-dom";
 import { avatarFor } from "discourse/widgets/post";
 import { userPath } from "discourse/lib/url";
 import { autoUpdatingRelativeAge } from "discourse/lib/formatter";
-import computed from "@ember/object/computed";
+import { computed } from "@ember/object";
 
 export function actionDescriptionHtml(actionCode, createdAt, username) {
   const dt = new Date(createdAt);

app/assets/javascripts/select-kit/components/multi-select/selected-name.js.es6

@@ -1,6 +1,7 @@
-import { default as computed, or, alias } from "@ember/object/computed";
+import { or, alias } from "@ember/object/computed";
 import Component from "@ember/component";
 import discourseComputed from "discourse-common/utils/decorators";
+import { computed } from "@ember/object";
 
 export default Component.extend({
   attributeBindings: [

plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js.es6

@@ -1,10 +1,10 @@
 import { withPluginApi } from "discourse/lib/plugin-api";
-import computed from "ember-addons/ember-computed-decorators";
+import discourseComputed from "discourse-common/utils/decorators";
 import showModal from "discourse/lib/show-modal";
 
 function initializePollUIBuilder(api) {
   api.modifyClass("controller:composer", {
-    @computed(
+    @discourseComputed(
       "siteSettings.poll_enabled",
       "siteSettings.poll_minimum_trust_level_to_create",
       "model.topic.pm_with_non_human_user"