REFACTOR: Replace Ember.controller.inject with import

Puts it more in line with updated ember code

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

@@ -1,10 +1,11 @@
+import { inject } from '@ember/controller';
 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 Controller.extend({
-  adminBackups: Ember.inject.controller(),
+  adminBackups: inject(),
   status: Ember.computed.alias("adminBackups.model"),
   uploadLabel: i18n("admin.backups.upload.label"),
   backupLocation: setting("backup_location"),

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

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

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

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

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

@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { setting } from "discourse/lib/computed";
 import computed from "ember-addons/ember-computed-decorators";
@@ -16,7 +17,7 @@ function staticReport(reportType) {
 export default Controller.extend(PeriodComputationMixin, {
   isLoading: false,
   dashboardFetchedAt: null,
-  exceptionController: Ember.inject.controller("exception"),
+  exceptionController: inject("exception"),
   logSearchQueriesEnabled: setting("log_search_queries"),
   basePath: Discourse.BaseUri,
 

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

@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { setting } from "discourse/lib/computed";
 import computed from "ember-addons/ember-computed-decorators";
@@ -9,7 +10,7 @@ const PROBLEMS_CHECK_MINUTES = 1;
 export default Controller.extend({
   isLoading: false,
   dashboardFetchedAt: null,
-  exceptionController: Ember.inject.controller("exception"),
+  exceptionController: inject("exception"),
   showVersionChecks: setting("version_checks"),
 
   @computed("problems.length")

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

@@ -1,9 +1,10 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Controller.extend({
   categoryNameKey: null,
-  adminSiteSettings: Ember.inject.controller(),
+  adminSiteSettings: inject(),
 
   @computed("adminSiteSettings.visibleSiteSettings", "categoryNameKey")
   category(categories, nameKey) {

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

@@ -1,10 +1,11 @@
+import { inject } from '@ember/controller';
 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 Controller.extend(GrantBadgeController, {
-  adminUser: Ember.inject.controller(),
+  adminUser: inject(),
   user: Ember.computed.alias("adminUser.model"),
   userBadges: Ember.computed.alias("model"),
   allBadges: Ember.computed.alias("badges"),

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

@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import WatchedWord from "admin/models/watched-word";
@@ -7,7 +8,7 @@ import showModal from "discourse/lib/show-modal";
 
 export default Controller.extend({
   actionNameKey: null,
-  adminWatchedWords: Ember.inject.controller(),
+  adminWatchedWords: inject(),
   showWordsList: Ember.computed.or(
     "adminWatchedWords.filtered",
     "adminWatchedWords.showWords"

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

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

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

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

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

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

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

@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { ajax } from "discourse/lib/ajax";
@@ -17,7 +18,7 @@ export default Controller.extend(ModalFunctionality, {
   remote: Ember.computed.equal("selection", "remote"),
   create: Ember.computed.equal("selection", "create"),
   selection: "popular",
-  adminCustomizeThemes: Ember.inject.controller(),
+  adminCustomizeThemes: inject(),
   loading: false,
   keyGenUrl: "/admin/themes/generate_key_pair",
   importUrl: "/admin/themes/import",
@@ -27,7 +28,7 @@ export default Controller.extend(ModalFunctionality, {
   uploadUrl: null,
   urlPlaceholder: "https://github.com/discourse/sample_theme",
   advancedVisible: false,
-  themesController: Ember.inject.controller("adminCustomizeThemes"),
+  themesController: inject("adminCustomizeThemes"),
   selectedType: Ember.computed.alias("themesController.currentTab"),
   component: Ember.computed.equal("selectedType", COMPONENTS),
 

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

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

app/assets/javascripts/discourse-loader.js

@@ -7,7 +7,10 @@ var define, requirejs;
     EMBER_MODULES = {
       jquery: { default: $ },
       "@ember/component": { default: Ember.Component },
-      "@ember/controller": { default: Ember.Controller },
+      "@ember/controller": {
+        default: Ember.Controller,
+        inject: Ember.inject.controller
+      },
       "@ember/object": { default: Ember.Object },
       "@ember/routing/route": { default: Ember.Route }
     };

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

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

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

@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import Badge from "discourse/models/badge";
 import UserBadge from "discourse/models/user-badge";
@@ -10,7 +11,7 @@ export default Controller.extend({
   queryParams: ["username"],
   noMoreBadges: false,
   userBadges: null,
-  application: Ember.inject.controller(),
+  application: inject(),
   hiddenSetTitle: true,
 
   @computed("userBadgesAll")

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

@@ -1,10 +1,11 @@
+import { inject } from '@ember/controller';
 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 Controller.extend({
-  topicBulkActions: Ember.inject.controller(),
+  topicBulkActions: inject(),
   notificationLevelId: null,
 
   @computed

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

@@ -1,10 +1,11 @@
+import { inject } from '@ember/controller';
 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 Controller.extend(ModalFunctionality, {
-  topicController: Ember.inject.controller("topic"),
+  topicController: inject("topic"),
 
   saving: false,
   new_user: null,

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

@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import computed from "ember-addons/ember-computed-decorators";
@@ -6,7 +7,7 @@ import Topic from "discourse/models/topic";
 
 // Modal related to changing the timestamp of posts
 export default Controller.extend(ModalFunctionality, {
-  topicController: Ember.inject.controller("topic"),
+  topicController: inject("topic"),
   saving: false,
   date: "",
   time: "",

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

@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import DiscourseURL from "discourse/lib/url";
 import Quote from "discourse/lib/quote";
@@ -76,7 +77,7 @@ export function addPopupMenuOptionsCallback(callback) {
 }
 
 export default Controller.extend({
-  topicController: Ember.inject.controller("topic"),
+  topicController: inject("topic"),
   router: Ember.inject.service(),
 
   checkedMessages: false,

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

@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -22,7 +23,7 @@ export default Controller.extend(
   NameValidation,
   UserFieldsValidation,
   {
-    login: Ember.inject.controller(),
+    login: inject(),
 
     complete: false,
     accountChallenge: 0,

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

@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import DiscourseNavigation from "discourse/components/d-navigation";
 
@@ -17,7 +18,7 @@ export const queryParams = {
 
 // Basic controller options
 const controllerOpts = {
-  discoveryTopics: Ember.inject.controller("discovery/topics"),
+  discoveryTopics: inject("discovery/topics"),
   queryParams: Object.keys(queryParams)
 };
 

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

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

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

@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import computed from "ember-addons/ember-computed-decorators";
 import DiscoveryController from "discourse/controllers/discovery";
 
@@ -9,7 +10,7 @@ const subcategoryStyleComponentNames = {
 };
 
 export default DiscoveryController.extend({
-  discovery: Ember.inject.controller(),
+  discovery: inject(),
 
   // this makes sure the composer isn't scoping to a specific category
   category: null,

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

@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import DiscoveryController from "discourse/controllers/discovery";
 import { queryParams } from "discourse/controllers/discovery-sortable";
 import BulkTopicSelection from "discourse/mixins/bulk-topic-selection";
@@ -8,8 +9,8 @@ import TopicList from "discourse/models/topic-list";
 import computed from "ember-addons/ember-computed-decorators";
 
 const controllerOpts = {
-  discovery: Ember.inject.controller(),
-  discoveryTopics: Ember.inject.controller("discovery/topics"),
+  discovery: inject(),
+  discoveryTopics: inject("discovery/topics"),
 
   period: null,
 

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

@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -6,7 +7,7 @@ import computed from "ember-addons/ember-computed-decorators";
 import InputValidation from "discourse/models/input-validation";
 
 export default Controller.extend(ModalFunctionality, {
-  topicController: Ember.inject.controller("topic"),
+  topicController: inject("topic"),
 
   loading: true,
   pinnedInCategoryCount: 0,

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

@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import {
@@ -26,8 +27,8 @@ const SortOrders = [
 const PAGE_LIMIT = 10;
 
 export default Controller.extend({
-  application: Ember.inject.controller(),
-  composer: Ember.inject.controller(),
+  application: inject(),
+  composer: inject(),
   bulkSelectEnabled: null,
 
   loading: false,

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

@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import { extractError } from "discourse/lib/ajax-error";
@@ -7,7 +8,7 @@ import Badge from "discourse/models/badge";
 import UserBadge from "discourse/models/user-badge";
 
 export default Controller.extend(ModalFunctionality, GrantBadgeController, {
-  topicController: Ember.inject.controller("topic"),
+  topicController: inject("topic"),
   loading: true,
   saving: false,
   selectedBadgeId: null,

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

@@ -1,11 +1,12 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { observes } from "ember-addons/ember-computed-decorators";
 import { fmt } from "discourse/lib/computed";
 
 export default Controller.extend({
-  group: Ember.inject.controller(),
-  groupActivity: Ember.inject.controller(),
-  application: Ember.inject.controller(),
+  group: inject(),
+  groupActivity: inject(),
+  application: inject(),
   canLoadMore: true,
   loading: false,
   emptyText: fmt("type", "groups.empty.%@"),

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

@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import Group from "discourse/models/group";
@@ -18,7 +19,7 @@ export default Controller.extend({
   showActions: false,
   filter: null,
   filterInput: null,
-  application: Ember.inject.controller(),
+  application: inject(),
 
   @observes("filterInput")
   _setFilter: debounce(function() {

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

@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import {
   default as computed,
@@ -5,10 +6,10 @@ import {
 } from "ember-addons/ember-computed-decorators";
 
 export default Controller.extend({
-  group: Ember.inject.controller(),
+  group: inject(),
   loading: false,
   offset: 0,
-  application: Ember.inject.controller(),
+  application: inject(),
 
   init() {
     this._super(...arguments);

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

@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
@@ -17,7 +18,7 @@ export default Controller.extend({
   offset: null,
   filter: null,
   filterInput: null,
-  application: Ember.inject.controller(),
+  application: inject(),
 
   @observes("filterInput")
   _setFilter: debounce(function() {

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

@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { default as computed } from "ember-addons/ember-computed-decorators";
 
@@ -11,7 +12,7 @@ const Tab = Ember.Object.extend({
 });
 
 export default Controller.extend({
-  application: Ember.inject.controller(),
+  application: inject(),
   counts: null,
   showing: "members",
   destroying: null,

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

@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import debounce from "discourse/lib/debounce";
 import {
@@ -6,7 +7,7 @@ import {
 } from "ember-addons/ember-computed-decorators";
 
 export default Controller.extend({
-  application: Ember.inject.controller(),
+  application: inject(),
   queryParams: ["order", "asc", "filter", "type"],
   order: null,
   asc: null,

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

@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
@@ -21,9 +22,9 @@ const AuthErrors = [
 ];
 
 export default Controller.extend(ModalFunctionality, {
-  createAccount: Ember.inject.controller(),
-  forgotPassword: Ember.inject.controller(),
-  application: Ember.inject.controller(),
+  createAccount: inject(),
+  forgotPassword: inject(),
+  application: inject(),
 
   loggingIn: false,
   loggedIn: false,

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

@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import ModalFunctionality from "discourse/mixins/modal-functionality";
 import { movePosts, mergeTopic } from "discourse/models/topic";
@@ -37,7 +38,7 @@ export default Controller.extend(ModalFunctionality, {
     ];
   },
 
-  topicController: Ember.inject.controller("topic"),
+  topicController: inject("topic"),
   selectedPostsCount: Ember.computed.alias(
     "topicController.selectedPostsCount"
   ),

app/assets/javascripts/discourse/controllers/navigation/categories.js.es6

@@ -1,8 +1,9 @@
+import { inject } from '@ember/controller';
 import NavigationDefaultController from "discourse/controllers/navigation/default";
 import computed from "ember-addons/ember-computed-decorators";
 
 export default NavigationDefaultController.extend({
-  discoveryCategories: Ember.inject.controller("discovery/categories"),
+  discoveryCategories: inject("discovery/categories"),
 
   @computed("discoveryCategories.model", "discoveryCategories.model.draft")
   draft() {

app/assets/javascripts/discourse/controllers/navigation/default.js.es6

@@ -1,9 +1,10 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
 export default Controller.extend({
-  discovery: Ember.inject.controller(),
-  discoveryTopics: Ember.inject.controller("discovery/topics"),
+  discovery: inject(),
+  discoveryTopics: inject("discovery/topics"),
 
   @computed("discoveryTopics.model", "discoveryTopics.model.draft")
   draft: function() {

app/assets/javascripts/discourse/controllers/preferences/interface.js.es6

@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { setDefaultHomepage } from "discourse/lib/utilities";
@@ -52,7 +53,7 @@ export default Controller.extend(PreferencesTabController, {
     return attrs;
   },
 
-  preferencesController: Ember.inject.controller("preferences"),
+  preferencesController: inject("preferences"),
 
   @computed()
   isiPad() {

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

@@ -1,10 +1,11 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import computed from "ember-addons/ember-computed-decorators";
 import { userPath } from "discourse/lib/url";
 
 export default Controller.extend({
-  application: Ember.inject.controller(),
+  application: inject(),
 
   showLoginButton: Ember.computed.equal("model.path", "login"),
 

app/assets/javascripts/discourse/controllers/tag-groups-show.js.es6

@@ -1,6 +1,7 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 export default Controller.extend({
-  tagGroups: Ember.inject.controller(),
+  tagGroups: inject(),
 
   actions: {
     save() {

app/assets/javascripts/discourse/controllers/tags-show.js.es6

@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import {
   default as computed,
@@ -50,7 +51,7 @@ if (customNavItemHref) {
 }
 
 export default Controller.extend(BulkTopicSelection, {
-  application: Ember.inject.controller(),
+  application: inject(),
 
   tag: null,
   additionalTags: null,

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

@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import Composer from "discourse/models/composer";
@@ -35,8 +36,8 @@ export function registerCustomPostMessageCallback(type, callback) {
 }
 
 export default Controller.extend(bufferedProperty("model"), {
-  composer: Ember.inject.controller(),
-  application: Ember.inject.controller(),
+  composer: inject(),
+  application: inject(),
   multiSelect: false,
   selectedPostIds: null,
   editingTopic: false,

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

@@ -1,10 +1,11 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { exportUserArchive } from "discourse/lib/export-csv";
 
 export default Controller.extend({
-  application: Ember.inject.controller(),
+  application: inject(),
   router: Ember.inject.service(),
-  user: Ember.inject.controller(),
+  user: inject(),
   userActionType: null,
 
   canDownloadPosts: Ember.computed.alias("user.viewingSelf"),

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

@@ -1,6 +1,7 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 export default Controller.extend({
-  user: Ember.inject.controller(),
+  user: inject(),
   username: Ember.computed.alias("user.model.username_lower"),
   sortedBadges: Ember.computed.sort("model", "badgeSortOrder"),
 

app/assets/javascripts/discourse/controllers/user-card.js.es6

@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import {
   default as DiscourseURL,
@@ -6,7 +7,7 @@ import {
 } from "discourse/lib/url";
 
 export default Controller.extend({
-  topic: Ember.inject.controller(),
+  topic: inject(),
   router: Ember.inject.service(),
 
   actions: {

app/assets/javascripts/discourse/controllers/user-notifications.js.es6

@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import { ajax } from "discourse/lib/ajax";
 import {
@@ -6,7 +7,7 @@ import {
 } from "ember-addons/ember-computed-decorators";
 
 export default Controller.extend({
-  application: Ember.inject.controller(),
+  application: inject(),
 
   @observes("model.canLoadMore")
   _showFooter() {

app/assets/javascripts/discourse/controllers/user-posts.js.es6

@@ -1,6 +1,7 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 export default Controller.extend({
-  application: Ember.inject.controller(),
+  application: inject(),
 
   _showFooter: function() {
     this.set("application.showFooter", !this.get("model.canLoadMore"));

app/assets/javascripts/discourse/controllers/user-private-messages.js.es6

@@ -1,11 +1,12 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import Topic from "discourse/models/topic";
 
 export default Controller.extend({
   router: Ember.inject.service(),
-  userTopicsList: Ember.inject.controller("user-topics-list"),
-  user: Ember.inject.controller(),
+  userTopicsList: inject("user-topics-list"),
+  user: inject(),
 
   pmView: false,
   viewingSelf: Ember.computed.alias("user.viewingSelf"),

app/assets/javascripts/discourse/controllers/user-summary.js.es6

@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 import { durationTiny } from "discourse/lib/formatter";
@@ -6,7 +7,7 @@ import { durationTiny } from "discourse/lib/formatter";
 const MAX_BADGES = 6;
 
 export default Controller.extend({
-  userController: Ember.inject.controller("user"),
+  userController: inject("user"),
   user: Ember.computed.alias("userController.model"),
 
   @computed("model.badges.length")

app/assets/javascripts/discourse/controllers/user-topics-list.js.es6

@@ -1,9 +1,10 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import computed from "ember-addons/ember-computed-decorators";
 
 // Lists of topics on a user's page.
 export default Controller.extend({
-  application: Ember.inject.controller(),
+  application: inject(),
 
   hideCategory: false,
   showPosters: false,

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

@@ -1,3 +1,4 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import CanCheckEmails from "discourse/mixins/can-check-emails";
 import computed from "ember-addons/ember-computed-decorators";
@@ -8,7 +9,7 @@ import { prioritizeNameInUx } from "discourse/lib/settings";
 export default Controller.extend(CanCheckEmails, {
   indexStream: false,
   router: Ember.inject.service(),
-  userNotifications: Ember.inject.controller("user-notifications"),
+  userNotifications: inject("user-notifications"),
   currentPath: Ember.computed.alias("router._router.currentPath"),
   adminTools: optionalService(),
 

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

@@ -1,8 +1,9 @@
+import { inject } from '@ember/controller';
 import Controller from "@ember/controller";
 import debounce from "discourse/lib/debounce";
 
 export default Controller.extend({
-  application: Ember.inject.controller(),
+  application: inject(),
   queryParams: ["period", "order", "asc", "name", "group", "exclude_usernames"],
   period: "weekly",
   order: "likes_received",