REFACTOR: Remove Ember.Controller in favor of import

app/assets/javascripts/admin/controllers/admin-backups-index.js.es6

@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { setting, i18n } from "discourse/lib/computed";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   adminBackups: Ember.inject.controller(),
   status: Ember.computed.alias("adminBackups.model"),
   uploadLabel: i18n("admin.backups.upload.label"),

app/assets/javascripts/admin/controllers/admin-backups-logs.js.es6

@@ -1,4 +1,5 @@
-export default Ember.Controller.extend({
+import Controller from "@ember/controller";
+export default Controller.extend({
   adminBackups: Ember.inject.controller(),
   status: Ember.computed.alias("adminBackups.model"),
 

app/assets/javascripts/admin/controllers/admin-backups.js.es6

@@ -1,4 +1,5 @@
-export default Ember.Controller.extend({
+import Controller from "@ember/controller";
+export default Controller.extend({
   noOperationIsRunning: Ember.computed.not("model.isOperationRunning"),
   rollbackEnabled: Ember.computed.and(
     "model.canRollback",

app/assets/javascripts/admin/controllers/admin-badges-show.js.es6

@@ -1,9 +1,10 @@
+import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import { propertyNotEqual } from "discourse/lib/computed";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend(bufferedProperty("model"), {
+export default Controller.extend(bufferedProperty("model"), {
   adminBadges: Ember.inject.controller(),
   saving: false,
   savingStatus: "",

app/assets/javascripts/admin/controllers/admin-badges.js.es6

@@ -1 +1,2 @@
-export default Ember.Controller.extend();
+import Controller from "@ember/controller";
+export default Controller.extend();

app/assets/javascripts/admin/controllers/admin-customize-colors-show.js.es6

@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   @computed("model.colors", "onlyOverridden")
   colors(allColors, onlyOverridden) {
     if (onlyOverridden) {

app/assets/javascripts/admin/controllers/admin-customize-colors.js.es6

@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import showModal from "discourse/lib/show-modal";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   @computed("model.@each.id")
   baseColorScheme() {
     return this.model.findBy("is_base", true);

app/assets/javascripts/admin/controllers/admin-customize-email-style-edit.js.es6

@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   @computed("model.isSaving")
   saveButtonText(isSaving) {
     return isSaving ? I18n.t("saving") : I18n.t("admin.customize.save");

app/assets/javascripts/admin/controllers/admin-customize-email-templates-edit.js.es6

@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend(bufferedProperty("emailTemplate"), {
+export default Controller.extend(bufferedProperty("emailTemplate"), {
   saved: false,
 
   @computed("buffered.body", "buffered.subject")

app/assets/javascripts/admin/controllers/admin-customize-email-templates.js.es6

@@ -1,4 +1,5 @@
-export default Ember.Controller.extend({
+import Controller from "@ember/controller";
+export default Controller.extend({
   emailTemplates: null,
   sortedTemplates: Ember.computed.sort("emailTemplates", "titleSorting"),
 

app/assets/javascripts/admin/controllers/admin-customize-robots-txt.js.es6

@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import { propertyEqual } from "discourse/lib/computed";
 
-export default Ember.Controller.extend(bufferedProperty("model"), {
+export default Controller.extend(bufferedProperty("model"), {
   saved: false,
   isSaving: false,
   saveDisabled: propertyEqual("model.robots_txt", "buffered.robots_txt"),

app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js.es6

@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import { url } from "discourse/lib/computed";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   section: null,
   currentTarget: 0,
   maximized: false,

app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6

@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { url } from "discourse/lib/computed";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -7,7 +8,7 @@ import { THEMES, COMPONENTS } from "admin/models/theme";
 
 const THEME_UPLOAD_VAR = 2;
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   downloadUrl: url("model.id", "/admin/customize/themes/%@/export"),
   previewUrl: url("model.id", "/admin/themes/%@/preview"),
   addButtonDisabled: Ember.computed.empty("selectedChildThemeId"),

app/assets/javascripts/admin/controllers/admin-customize-themes.js.es6

@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { THEMES } from "admin/models/theme";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   currentTab: THEMES,
 
   @computed("model", "model.@each.component")

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

@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import { setting } from "discourse/lib/computed";
 import computed from "ember-addons/ember-computed-decorators";
 import AdminDashboard from "admin/models/admin-dashboard";
@@ -12,7 +13,7 @@ function staticReport(reportType) {
   });
 }
 
-export default Ember.Controller.extend(PeriodComputationMixin, {
+export default Controller.extend(PeriodComputationMixin, {
   isLoading: false,
   dashboardFetchedAt: null,
   exceptionController: Ember.inject.controller("exception"),

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

@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import PeriodComputationMixin from "admin/mixins/period-computation";
 
-export default Ember.Controller.extend(PeriodComputationMixin, {
+export default Controller.extend(PeriodComputationMixin, {
   @computed
   flagsStatusOptions() {
     return {

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

@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 const { get } = Ember;
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   filter: null,
 
   @computed("model.[]", "filter")

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

@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import { setting } from "discourse/lib/computed";
 import computed from "ember-addons/ember-computed-decorators";
 import AdminDashboard from "admin/models/admin-dashboard";
@@ -5,7 +6,7 @@ import VersionCheck from "admin/models/version-check";
 
 const PROBLEMS_CHECK_MINUTES = 1;
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   isLoading: false,
   dashboardFetchedAt: null,
   exceptionController: Ember.inject.controller("exception"),

app/assets/javascripts/admin/controllers/admin-email-advanced-test.js.es6

@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   email: null,
   text: null,
   elided: null,

app/assets/javascripts/admin/controllers/admin-email-index.js.es6

@@ -1,5 +1,6 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
-export default Ember.Controller.extend({
+export default Controller.extend({
   /**
     Is the "send test email" button disabled?
 

app/assets/javascripts/admin/controllers/admin-email-logs.js.es6

@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import EmailLog from "admin/models/email-log";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   loading: false,
 
   loadLogs(sourceModel, loadMore) {

app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6

@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import EmailPreview from "admin/models/email-preview";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   username: null,
   lastSeen: null,
 

app/assets/javascripts/admin/controllers/admin-embedding.js.es6

@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   saved: false,
   embedding: null,
 

app/assets/javascripts/admin/controllers/admin-emojis.js.es6

@@ -1,5 +1,6 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
-export default Ember.Controller.extend({
+export default Controller.extend({
   sortedEmojis: Ember.computed.sort("model", "emojiSorting"),
 
   init() {

app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6

@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import { exportEntity } from "discourse/lib/export-csv";
 import { outputExportResult } from "discourse/lib/export-result";
 import ScreenedEmail from "admin/models/screened-email";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   loading: false,
 
   actions: {

app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6

@@ -1,9 +1,10 @@
+import Controller from "@ember/controller";
 import debounce from "discourse/lib/debounce";
 import { outputExportResult } from "discourse/lib/export-result";
 import { exportEntity } from "discourse/lib/export-csv";
 import ScreenedIpAddress from "admin/models/screened-ip-address";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   loading: false,
   filter: null,
   savedIpAddress: null,

app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6

@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import { exportEntity } from "discourse/lib/export-csv";
 import { outputExportResult } from "discourse/lib/export-result";
 import ScreenedUrl from "admin/models/screened-url";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   loading: false,
 
   show() {

app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js.es6

@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import { exportEntity } from "discourse/lib/export-csv";
 import { outputExportResult } from "discourse/lib/export-result";
 import {
@@ -5,7 +6,7 @@ import {
   on
 } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   model: null,
   filters: null,
   filtersExists: Ember.computed.gt("filterCount", 0),

app/assets/javascripts/admin/controllers/admin-permalinks.js.es6

@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import debounce from "discourse/lib/debounce";
 import Permalink from "admin/models/permalink";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   loading: false,
   filter: null,
 

app/assets/javascripts/admin/controllers/admin-plugins.js.es6

@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   @computed
   adminRoutes: function() {
     return this.model

app/assets/javascripts/admin/controllers/admin-reports-show.js.es6

@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   queryParams: ["start_date", "end_date", "filters"],
   start_date: null,
   end_date: null,

app/assets/javascripts/admin/controllers/admin-search-logs-index.js.es6

@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 export const DEFAULT_PERIOD = "yearly";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   loading: false,
   period: DEFAULT_PERIOD,
   searchType: "all",

app/assets/javascripts/admin/controllers/admin-search-logs-term.js.es6

@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import { DEFAULT_PERIOD } from "admin/controllers/admin-search-logs-index";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   loading: false,
   term: null,
   period: DEFAULT_PERIOD,

app/assets/javascripts/admin/controllers/admin-site-settings-category.js.es6

@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   categoryNameKey: null,
   adminSiteSettings: Ember.inject.controller(),
 

app/assets/javascripts/admin/controllers/admin-site-settings.js.es6

@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import debounce from "discourse/lib/debounce";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   filter: null,
   allSiteSettings: Ember.computed.alias("model"),
   visibleSiteSettings: null,

app/assets/javascripts/admin/controllers/admin-site-text-edit.js.es6

@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend(bufferedProperty("siteText"), {
+export default Controller.extend(bufferedProperty("siteText"), {
   saved: false,
 
   @computed("buffered.value")

app/assets/javascripts/admin/controllers/admin-site-text-index.js.es6

@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 let lastSearch;
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   searching: false,
   siteTexts: null,
   preferred: false,

app/assets/javascripts/admin/controllers/admin-user-badges.js.es6

@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import GrantBadgeController from "discourse/mixins/grant-badge-controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend(GrantBadgeController, {
+export default Controller.extend(GrantBadgeController, {
   adminUser: Ember.inject.controller(),
   user: Ember.computed.alias("adminUser.model"),
   userBadges: Ember.computed.alias("model"),

app/assets/javascripts/admin/controllers/admin-user-fields.js.es6

@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
 const MAX_FIELDS = 20;
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   fieldTypes: null,
   createDisabled: Ember.computed.gte("model.length", MAX_FIELDS),
   sortedFields: Ember.computed.sort("model", "fieldSortOrder"),

app/assets/javascripts/admin/controllers/admin-user-index.js.es6

@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import CanCheckEmails from "discourse/mixins/can-check-emails";
 import { propertyNotEqual, setting } from "discourse/lib/computed";
@@ -6,7 +7,7 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { fmt } from "discourse/lib/computed";
 
-export default Ember.Controller.extend(CanCheckEmails, {
+export default Controller.extend(CanCheckEmails, {
   adminTools: Ember.inject.service(),
   originalPrimaryGroupId: null,
   customGroupIdsBuffer: null,

app/assets/javascripts/admin/controllers/admin-user.js.es6

@@ -1 +1,2 @@
-export default Ember.Controller.extend();
+import Controller from "@ember/controller";
+export default Controller.extend();

app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6

@@ -1,10 +1,11 @@
+import Controller from "@ember/controller";
 import debounce from "discourse/lib/debounce";
 import { i18n } from "discourse/lib/computed";
 import AdminUser from "admin/models/admin-user";
 import CanCheckEmails from "discourse/mixins/can-check-emails";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend(CanCheckEmails, {
+export default Controller.extend(CanCheckEmails, {
   model: null,
   query: null,
   order: null,

app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6

@@ -1,10 +1,11 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import WatchedWord from "admin/models/watched-word";
 import { ajax } from "discourse/lib/ajax";
 import { fmt } from "discourse/lib/computed";
 import showModal from "discourse/lib/show-modal";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   actionNameKey: null,
   adminWatchedWords: Ember.inject.controller(),
   showWordsList: Ember.computed.or(

app/assets/javascripts/admin/controllers/admin-watched-words.js.es6

@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import debounce from "discourse/lib/debounce";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   filter: null,
   filtered: false,
   showWords: false,

app/assets/javascripts/admin/controllers/admin-web-hooks-show-events.js.es6

@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   pingDisabled: false,
   incomingCount: Ember.computed.alias("incomingEventIds.length"),
 

app/assets/javascripts/admin/controllers/admin-web-hooks-show.js.es6

@@ -1,9 +1,10 @@
+import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { extractDomainFromUrl } from "discourse/lib/utilities";
 import computed from "ember-addons/ember-computed-decorators";
 import InputValidation from "discourse/models/input-validation";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   adminWebHooks: Ember.inject.controller(),
   eventTypes: Ember.computed.alias("adminWebHooks.eventTypes"),
   defaultEventTypes: Ember.computed.alias("adminWebHooks.defaultEventTypes"),

app/assets/javascripts/admin/controllers/admin-web-hooks.js.es6

@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   actions: {
     destroy(webhook) {
       return bootbox.confirm(

app/assets/javascripts/admin/controllers/admin.js.es6

@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   router: Ember.inject.service(),
 
   @computed("siteSettings.enable_group_directory")

app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6

@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 import {
@@ -52,7 +53,7 @@ const SCSS_VARIABLE_NAMES = [
   "love-low"
 ];
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   adminCustomizeThemesShow: Ember.inject.controller(),
 
   uploadUrl: "/admin/themes/upload_asset",

app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js.es6

@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import { escapeExpression } from "discourse/lib/utilities";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   sample: Ember.computed.alias("model.sample"),
   errors: Ember.computed.alias("model.errors"),
   count: Ember.computed.alias("model.grant_count"),

app/assets/javascripts/admin/controllers/modals/admin-color-scheme-select-base.js.es6

@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   adminCustomizeColors: Ember.inject.controller(),
 
   actions: {

app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js.es6

@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { observes } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   @observes("model")
   modelChanged() {
     const model = this.model;

app/assets/javascripts/admin/controllers/modals/admin-incoming-email.js.es6

@@ -1,10 +1,11 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import IncomingEmail from "admin/models/incoming-email";
 import computed from "ember-addons/ember-computed-decorators";
 import { longDate } from "discourse/lib/formatter";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   @computed("model.date")
   date(d) {
     return longDate(d);

app/assets/javascripts/admin/controllers/modals/admin-install-theme.js.es6

@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -10,7 +11,7 @@ import { POPULAR_THEMES } from "discourse-common/helpers/popular-themes";
 
 const MIN_NAME_LENGTH = 4;
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   popular: Ember.computed.equal("selection", "popular"),
   local: Ember.computed.equal("selection", "local"),
   remote: Ember.computed.equal("selection", "remote"),

app/assets/javascripts/admin/controllers/modals/admin-reseed.js.es6

@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   loading: true,
   reseeding: false,
   categories: null,

app/assets/javascripts/admin/controllers/modals/admin-silence-user.js.es6

@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import PenaltyController from "admin/mixins/penalty-controller";
 
-export default Ember.Controller.extend(PenaltyController, {
+export default Controller.extend(PenaltyController, {
   silenceUntil: null,
   silencing: false,
 

app/assets/javascripts/admin/controllers/modals/admin-staff-action-log-details.js.es6

@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Ember.Controller.extend(ModalFunctionality);
+export default Controller.extend(ModalFunctionality);

app/assets/javascripts/admin/controllers/modals/admin-start-backup.js.es6

@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   adminBackupsLogs: Ember.inject.controller(),
 
   actions: {

app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js.es6

@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import PenaltyController from "admin/mixins/penalty-controller";
 
-export default Ember.Controller.extend(PenaltyController, {
+export default Controller.extend(PenaltyController, {
   suspendUntil: null,
   suspending: false,
 

app/assets/javascripts/admin/controllers/modals/admin-theme-change.js.es6

@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   loadDiff() {
     this.set("loading", true);
     ajax(

app/assets/javascripts/admin/controllers/modals/admin-uploaded-image-list.js.es6

@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import { on, observes } from "ember-addons/ember-computed-decorators";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   @on("init")
   @observes("model.value")
   _setup() {

app/assets/javascripts/admin/controllers/modals/admin-watched-word-test.js.es6

@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   @computed("value", "model.compiledRegularExpression")
   matches(value, regexpString) {
     if (!value || !regexpString) return;

app/assets/javascripts/admin/controllers/modals/site-setting-default-categories.js.es6

@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   onShow() {
     this.set("updateExistingUsers", null);
   },

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

@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   faqOverriden: Ember.computed.gt("siteSettings.faq_url.length", 0),
 
   @computed

app/assets/javascripts/discourse/controllers/account-created-edit-email.js.es6

@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import { changeEmail } from "discourse/lib/user-activation";
 import computed from "ember-addons/ember-computed-decorators";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   accountCreated: null,
   newEmail: null,
 

app/assets/javascripts/discourse/controllers/account-created-index.js.es6

@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import { resendActivationEmail } from "discourse/lib/user-activation";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   actions: {
     sendActivationEmail() {
       resendActivationEmail(this.get("accountCreated.username")).then(() => {

app/assets/javascripts/discourse/controllers/activation-edit.js.es6

@@ -1,9 +1,10 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { extractError } from "discourse/lib/ajax-error";
 import { changeEmail } from "discourse/lib/user-activation";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   login: Ember.inject.controller(),
 
   currentEmail: null,

app/assets/javascripts/discourse/controllers/add-post-notice.js.es6

@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import computed from "ember-addons/ember-computed-decorators";
 import { cookAsync } from "discourse/lib/text";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   post: null,
   resolve: null,
   reject: null,

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

@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import { isAppWebview, isiOSPWA } from "discourse/lib/utilities";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   showTop: true,
   showFooter: false,
   router: Ember.inject.service(),

app/assets/javascripts/discourse/controllers/associate-account-confirm.js.es6

@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   actions: {
     finishConnect() {
       ajax({

app/assets/javascripts/discourse/controllers/auth-token.js.es6

@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 import { userPath } from "discourse/lib/url";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   expanded: false,
 
   onShow() {

app/assets/javascripts/discourse/controllers/avatar-selector.js.es6

@@ -1,10 +1,11 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 import { allowsImages } from "discourse/lib/utilities";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   @computed(
     "selected",
     "user.system_avatar_upload_id",

app/assets/javascripts/discourse/controllers/badges/index.js.es6

@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   @computed("model")
   badgeGroups(model) {
     var sorted = _.sortBy(model, function(badge) {

app/assets/javascripts/discourse/controllers/badges/show.js.es6

@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import Badge from "discourse/models/badge";
 import UserBadge from "discourse/models/user-badge";
 import {
@@ -5,7 +6,7 @@ import {
   observes
 } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   queryParams: ["username"],
   noMoreBadges: false,
   userBadges: null,

app/assets/javascripts/discourse/controllers/basic-modal-body.js.es6

@@ -1,5 +1,6 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   modal: null
 });

app/assets/javascripts/discourse/controllers/bulk-notification-level.js.es6

@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import { topicLevels } from "discourse/lib/notification-levels";
 
 // Support for changing the notification level of various topics
-export default Ember.Controller.extend({
+export default Controller.extend({
   topicBulkActions: Ember.inject.controller(),
   notificationLevelId: null,
 

app/assets/javascripts/discourse/controllers/change-owner.js.es6

@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import DiscourseURL from "discourse/lib/url";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   topicController: Ember.inject.controller("topic"),
 
   saving: false,

app/assets/javascripts/discourse/controllers/change-timestamp.js.es6

@@ -1,10 +1,11 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import computed from "ember-addons/ember-computed-decorators";
 import DiscourseURL from "discourse/lib/url";
 import Topic from "discourse/models/topic";
 
 // Modal related to changing the timestamp of posts
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   topicController: Ember.inject.controller("topic"),
   saving: false,
   date: "",

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

@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import DiscourseURL from "discourse/lib/url";
 import Quote from "discourse/lib/quote";
 import Draft from "discourse/models/draft";
@@ -74,7 +75,7 @@ export function addPopupMenuOptionsCallback(callback) {
   _popupMenuOptionsCallbacks.push(callback);
 }
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   topicController: Ember.inject.controller("topic"),
   router: Ember.inject.service(),
 

app/assets/javascripts/discourse/controllers/convert-to-public-topic.js.es6

@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   publicCategoryId: null,
   saving: true,
 

app/assets/javascripts/discourse/controllers/create-account.js.es6

@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { setting } from "discourse/lib/computed";
@@ -14,7 +15,7 @@ import UserFieldsValidation from "discourse/mixins/user-fields-validation";
 import { userPath } from "discourse/lib/url";
 import { findAll } from "discourse/models/login-method";
 
-export default Ember.Controller.extend(
+export default Controller.extend(
   ModalFunctionality,
   PasswordValidation,
   UsernameValidation,

app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6

@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import DiscourseNavigation from "discourse/components/d-navigation";
 
 // Just add query params here to have them automatically passed to topic list filters.
@@ -25,7 +26,7 @@ controllerOpts.queryParams.forEach(
   p => (controllerOpts[p] = Ember.computed.alias(`discoveryTopics.${p}`))
 );
 
-const Controller = Ember.Controller.extend(controllerOpts);
+const Controller = Controller.extend(controllerOpts);
 
 export const addDiscoveryQueryParam = function(p, opts) {
   queryParams[p] = opts;

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

@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import DiscourseURL from "discourse/lib/url";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   discoveryTopics: Ember.inject.controller("discovery/topics"),
   navigationCategory: Ember.inject.controller("navigation/category"),
   application: Ember.inject.controller(),

app/assets/javascripts/discourse/controllers/edit-category.js.es6

@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import DiscourseURL from "discourse/lib/url";
 import { extractError } from "discourse/lib/ajax-error";
@@ -7,7 +8,7 @@ import {
   observes
 } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   selectedTab: null,
   saving: false,
   deleting: false,

app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6

@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import TopicTimer from "discourse/models/topic-timer";
@@ -10,7 +11,7 @@ export const DELETE_STATUS_TYPE = "delete";
 export const REMINDER_TYPE = "reminder";
 export const BUMP_TYPE = "bump";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   loading: false,
   isPublic: "true",
 

app/assets/javascripts/discourse/controllers/email-login.js.es6

@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import { SECOND_FACTOR_METHODS } from "discourse/models/user";
 import { ajax } from "discourse/lib/ajax";
@@ -5,7 +6,7 @@ import DiscourseURL from "discourse/lib/url";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { getWebauthnCredential } from "discourse/lib/webauthn";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   lockImageUrl: Discourse.getURL("/images/lock.svg"),
 
   @computed("model")

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

@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import {
   on,
   default as computed
@@ -26,7 +27,7 @@ const ButtonBackBright = {
   };
 
 // The controller for the nice error page
-export default Ember.Controller.extend({
+export default Controller.extend({
   thrown: null,
   lastTransition: null,
 

app/assets/javascripts/discourse/controllers/explain-reviewable.js.es6

@@ -1,6 +1,7 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   loading: null,
   reviewableExplanation: null,
 

app/assets/javascripts/discourse/controllers/feature-topic.js.es6

@@ -1,10 +1,11 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { categoryLinkHTML } from "discourse/helpers/category-link";
 import computed from "ember-addons/ember-computed-decorators";
 import InputValidation from "discourse/models/input-validation";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   topicController: Ember.inject.controller("topic"),
 
   loading: true,

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

@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import ActionSummary from "discourse/models/action-summary";
 import { MAX_MESSAGE_LENGTH } from "discourse/models/post-action-type";
@@ -5,7 +6,7 @@ import computed from "ember-addons/ember-computed-decorators";
 import optionalService from "discourse/lib/optional-service";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   adminTools: optionalService(),
   userDetails: null,
   selected: null,

app/assets/javascripts/discourse/controllers/forgot-password.js.es6

@@ -1,10 +1,11 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { escapeExpression } from "discourse/lib/utilities";
 import { extractError } from "discourse/lib/ajax-error";
 import computed from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   offerHelp: null,
   helpSeen: false,
 

app/assets/javascripts/discourse/controllers/full-page-search.js.es6

@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import {
   translateResults,
@@ -24,7 +25,7 @@ const SortOrders = [
 ];
 const PAGE_LIMIT = 10;
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   application: Ember.inject.controller(),
   composer: Ember.inject.controller(),
   bulkSelectEnabled: null,

app/assets/javascripts/discourse/controllers/grant-badge.js.es6

@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import { extractError } from "discourse/lib/ajax-error";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -5,10 +6,7 @@ import GrantBadgeController from "discourse/mixins/grant-badge-controller";
 import Badge from "discourse/models/badge";
 import UserBadge from "discourse/models/user-badge";
 
-export default Ember.Controller.extend(
+export default Controller.extend(ModalFunctionality, GrantBadgeController, {
-  ModalFunctionality,
-  GrantBadgeController,
-  {
   topicController: Ember.inject.controller("topic"),
   loading: true,
   saving: false,
@@ -82,5 +80,4 @@ export default Ember.Controller.extend(
         .finally(() => this.set("saving", false));
     }
   }
-  }
+});
-);

app/assets/javascripts/discourse/controllers/group-activity-posts.js.es6

@@ -1,7 +1,8 @@
+import Controller from "@ember/controller";
 import { observes } from "ember-addons/ember-computed-decorators";
 import { fmt } from "discourse/lib/computed";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   group: Ember.inject.controller(),
   groupActivity: Ember.inject.controller(),
   application: Ember.inject.controller(),

app/assets/javascripts/discourse/controllers/group-activity-topics.js.es6

@@ -1,4 +1,5 @@
-export default Ember.Controller.extend({
+import Controller from "@ember/controller";
+export default Controller.extend({
   actions: {
     loadMore() {
       this.model.loadMore();

app/assets/javascripts/discourse/controllers/group-activity.js.es6

@@ -1,4 +1,5 @@
-export default Ember.Controller.extend({
+import Controller from "@ember/controller";
+export default Controller.extend({
   router: Ember.inject.service(),
   queryParams: ["category_id"]
 });

app/assets/javascripts/discourse/controllers/group-add-members.js.es6

@@ -1,8 +1,9 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import { extractError } from "discourse/lib/ajax-error";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   loading: false,
   setAsOwner: false,
 

app/assets/javascripts/discourse/controllers/group-bulk-add.js.es6

@@ -1,9 +1,10 @@
+import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import { extractError } from "discourse/lib/ajax-error";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
 
-export default Ember.Controller.extend(ModalFunctionality, {
+export default Controller.extend(ModalFunctionality, {
   loading: false,
 
   @computed("input", "loading", "result")

app/assets/javascripts/discourse/controllers/group-index.js.es6

@@ -1,3 +1,4 @@
+import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import Group from "discourse/models/group";
 import {
@@ -6,7 +7,7 @@ import {
 } from "ember-addons/ember-computed-decorators";
 import debounce from "discourse/lib/debounce";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   queryParams: ["order", "desc", "filter"],
   order: "",
   desc: null,

app/assets/javascripts/discourse/controllers/group-manage-logs.js.es6

@@ -1,9 +1,10 @@
+import Controller from "@ember/controller";
 import {
   default as computed,
   observes
 } from "ember-addons/ember-computed-decorators";
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   group: Ember.inject.controller(),
   loading: false,
   offset: 0,