Match service/controller import to ember-modules-codemod style for consistency

no issue

Automated tools, code generators, and editor integrations are increasingly standardising on the import style used in `ember-modules-codemod`. Our import style differed a little with regards to service/controller injection imports which meant we were starting to see inconsistent naming.

ghost/admin/app/adapters/base.js

@@ -2,7 +2,7 @@ import AjaxServiceSupport from 'ember-ajax/mixins/ajax-support';
 import DataAdapterMixin from 'ember-simple-auth/mixins/data-adapter-mixin';
 import RESTAdapter from 'ember-data/adapters/rest';
 import ghostPaths from 'ghost-admin/utils/ghost-paths';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default RESTAdapter.extend(DataAdapterMixin, AjaxServiceSupport, {
     authorizer: 'authorizer:oauth2',
@@ -10,7 +10,7 @@ export default RESTAdapter.extend(DataAdapterMixin, AjaxServiceSupport, {
     host: window.location.origin,
     namespace: ghostPaths().apiRoot.slice(1),
 
-    session: injectService(),
+    session: service(),
 
     shouldBackgroundReloadRecord() {
         return false;

ghost/admin/app/authenticators/oauth2.js

@@ -2,16 +2,16 @@ import Authenticator from 'ember-simple-auth/authenticators/oauth2-password-gran
 import RSVP from 'rsvp';
 import {assign} from '@ember/polyfills';
 import {computed} from '@ember/object';
-import {inject as injectService} from '@ember/service';
 import {isEmpty} from '@ember/utils';
 import {run} from '@ember/runloop';
+import {inject as service} from '@ember/service';
 import {makeArray as wrap} from '@ember/array';
 
 export default Authenticator.extend({
-    ajax: injectService(),
+    ajax: service(),
-    session: injectService(),
+    session: service(),
-    config: injectService(),
+    config: service(),
-    ghostPaths: injectService(),
+    ghostPaths: service(),
 
     init() {
         this._super(...arguments);

ghost/admin/app/components/gh-alert.js

@@ -1,13 +1,13 @@
 import Component from '@ember/component';
 import {computed} from '@ember/object';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default Component.extend({
     tagName: 'article',
     classNames: ['gh-alert'],
     classNameBindings: ['typeClass'],
 
-    notifications: injectService(),
+    notifications: service(),
 
     typeClass: computed('message.type', function () {
         let type = this.get('message.type');

ghost/admin/app/components/gh-alerts.js

@@ -1,13 +1,13 @@
 import Component from '@ember/component';
 import {alias} from '@ember/object/computed';
-import {inject as injectService} from '@ember/service';
 import {observer} from '@ember/object';
+import {inject as service} from '@ember/service';
 
 export default Component.extend({
     tagName: 'aside',
     classNames: 'gh-alerts',
 
-    notifications: injectService(),
+    notifications: service(),
 
     messages: alias('notifications.alerts'),
 

ghost/admin/app/components/gh-basic-dropdown.js

@@ -1,9 +1,9 @@
 import BasicDropdown from 'ember-basic-dropdown/components/basic-dropdown';
 import layout from 'ember-basic-dropdown/templates/components/basic-dropdown';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default BasicDropdown.extend({
-    dropdown: injectService(),
+    dropdown: service(),
 
     layout,
 

ghost/admin/app/components/gh-blog-url.js

@@ -1,8 +1,8 @@
 import Component from '@ember/component';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default Component.extend({
     tagName: '',
 
-    config: injectService()
+    config: service()
 });

ghost/admin/app/components/gh-cm-editor.js

@@ -5,7 +5,7 @@ import boundOneWay from 'ghost-admin/utils/bound-one-way';
 import {InvokeActionMixin} from 'ember-invoke-action';
 import {assign} from '@ember/polyfills';
 import {bind, once, scheduleOnce} from '@ember/runloop';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 const CmEditorComponent =  Component.extend(InvokeActionMixin, {
     classNameBindings: ['isFocused:focus'],
@@ -21,7 +21,7 @@ const CmEditorComponent =  Component.extend(InvokeActionMixin, {
 
     _editor: null, // reference to CodeMirror editor
 
-    lazyLoader: injectService(),
+    lazyLoader: service(),
 
     didReceiveAttrs() {
         if (this.get('value') === null || undefined) {

ghost/admin/app/components/gh-content-cover.js

@@ -11,10 +11,10 @@ Example:
 **/
 
 import Component from '@ember/component';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default Component.extend({
-    ui: injectService(),
+    ui: service(),
 
     classNames: ['content-cover'],
 

ghost/admin/app/components/gh-date-time-picker.js

@@ -1,12 +1,12 @@
 import Component from '@ember/component';
 import moment from 'moment';
 import {computed} from '@ember/object';
-import {inject as injectService} from '@ember/service';
 import {isBlank, isEmpty} from '@ember/utils';
 import {or, reads} from '@ember/object/computed';
+import {inject as service} from '@ember/service';
 
 export default Component.extend({
-    settings: injectService(),
+    settings: service(),
 
     tagName: '',
 

ghost/admin/app/components/gh-datetime-input.js

@@ -3,7 +3,7 @@ import boundOneWay from 'ghost-admin/utils/bound-one-way';
 import moment from 'moment';
 import {InvokeActionMixin} from 'ember-invoke-action';
 import {formatDate} from 'ghost-admin/utils/date-formatting';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default Component.extend(InvokeActionMixin, {
     tagName: 'span',
@@ -13,7 +13,7 @@ export default Component.extend(InvokeActionMixin, {
     inputClass: null,
     inputId: null,
     inputName: null,
-    settings: injectService(),
+    settings: service(),
 
     didReceiveAttrs() {
         let datetime = this.get('datetime') || moment.utc();

ghost/admin/app/components/gh-download-count.js

@@ -1,14 +1,14 @@
 import Component from '@ember/component';
 import Ember from 'ember';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 import {task, timeout} from 'ember-concurrency';
 
 const {testing} = Ember;
 const INTERVAL = testing ? 20 : 2000;
 
 export default Component.extend({
-    ajax: injectService(),
+    ajax: service(),
-    ghostPaths: injectService(),
+    ghostPaths: service(),
 
     tagName: '',
     count: '',

ghost/admin/app/components/gh-dropdown-button.js

@@ -1,6 +1,6 @@
 import Component from '@ember/component';
 import DropdownMixin from 'ghost-admin/mixins/dropdown-mixin';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default Component.extend(DropdownMixin, {
     tagName: 'button',
@@ -10,7 +10,7 @@ export default Component.extend(DropdownMixin, {
     // matches with the dropdown this button toggles
     dropdownName: null,
 
-    dropdown: injectService(),
+    dropdown: service(),
 
     // Notify dropdown service this dropdown should be toggled
     click(event) {

ghost/admin/app/components/gh-dropdown.js

@@ -1,8 +1,8 @@
 import Component from '@ember/component';
 import DropdownMixin from 'ghost-admin/mixins/dropdown-mixin';
 import {computed} from '@ember/object';
-import {inject as injectService} from '@ember/service';
 import {run} from '@ember/runloop';
+import {inject as service} from '@ember/service';
 
 export default Component.extend(DropdownMixin, {
     classNames: 'dropdown',
@@ -22,7 +22,7 @@ export default Component.extend(DropdownMixin, {
         return this.get('isOpen') && !this.get('closing');
     }),
 
-    dropdown: injectService(),
+    dropdown: service(),
 
     open() {
         this.set('isOpen', true);

ghost/admin/app/components/gh-editor.js

@@ -3,13 +3,13 @@ import {
     IMAGE_EXTENSIONS,
     IMAGE_MIME_TYPES
 } from 'ghost-admin/components/gh-image-uploader';
-import {inject as injectService} from '@ember/service';
 import {run} from '@ember/runloop';
+import {inject as service} from '@ember/service';
 
 const {debounce} = run;
 
 export default Component.extend({
-    ui: injectService(),
+    ui: service(),
 
     classNameBindings: [
         'isDraggedOver:-drag-over',

ghost/admin/app/components/gh-feature-flag.js

@@ -1,6 +1,6 @@
 import Component from '@ember/component';
 import {computed} from '@ember/object';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 const FeatureFlagComponent = Component.extend({
     tagName: 'label',
@@ -8,7 +8,7 @@ const FeatureFlagComponent = Component.extend({
     attributeBindings: ['for'],
     _flagValue: null,
 
-    feature: injectService(),
+    feature: service(),
 
     init() {
         this._super(...arguments);

ghost/admin/app/components/gh-file-uploader.js

@@ -7,11 +7,11 @@ import {
 } from 'ghost-admin/services/ajax';
 import {computed} from '@ember/object';
 import {htmlSafe} from '@ember/string';
-import {inject as injectService} from '@ember/service';
 import {invokeAction} from 'ember-invoke-action';
 import {isBlank} from '@ember/utils';
 import {isArray as isEmberArray} from '@ember/array';
 import {run} from '@ember/runloop';
+import {inject as service} from '@ember/service';
 
 export default Component.extend({
     tagName: 'section',
@@ -32,9 +32,9 @@ export default Component.extend({
     failureMessage: null,
     uploadPercentage: 0,
 
-    ajax: injectService(),
+    ajax: service(),
-    eventBus: injectService(),
+    eventBus: service(),
-    notifications: injectService(),
+    notifications: service(),
 
     formData: computed('file', function () {
         let paramName = this.get('paramName');

ghost/admin/app/components/gh-fullscreen-modal.js

@@ -2,17 +2,17 @@ import Component from '@ember/component';
 import RSVP from 'rsvp';
 import {computed} from '@ember/object';
 import {A as emberA} from '@ember/array';
-import {inject as injectService} from '@ember/service';
 import {invokeAction} from 'ember-invoke-action';
 import {isBlank} from '@ember/utils';
 import {run} from '@ember/runloop';
+import {inject as service} from '@ember/service';
 
 const FullScreenModalComponent = Component.extend({
 
     model: null,
     modifier: null,
 
-    dropdown: injectService(),
+    dropdown: service(),
 
     modalPath: computed('modal', function () {
         return `modal-${this.get('modal') || 'unknown'}`;

ghost/admin/app/components/gh-image-uploader.js

@@ -8,20 +8,20 @@ import {
 } from 'ghost-admin/services/ajax';
 import {computed} from '@ember/object';
 import {htmlSafe} from '@ember/string';
-import {inject as injectService} from '@ember/service';
 import {invokeAction} from 'ember-invoke-action';
 import {isBlank} from '@ember/utils';
 import {isArray as isEmberArray} from '@ember/array';
 import {run} from '@ember/runloop';
+import {inject as service} from '@ember/service';
 
 export const IMAGE_MIME_TYPES = 'image/gif,image/jpg,image/jpeg,image/png,image/svg+xml';
 export const IMAGE_EXTENSIONS = ['gif', 'jpg', 'jpeg', 'png', 'svg'];
 
 export default Component.extend({
-    ajax: injectService(),
+    ajax: service(),
-    config: injectService(),
+    config: service(),
-    notifications: injectService(),
+    notifications: service(),
-    settings: injectService(),
+    settings: service(),
 
     tagName: 'section',
     classNames: ['gh-image-uploader'],

ghost/admin/app/components/gh-markdown-editor.js

@@ -6,9 +6,9 @@ import {assign} from '@ember/polyfills';
 import {computed} from '@ember/object';
 import {copy} from '@ember/object/internals';
 import {htmlSafe} from '@ember/string';
-import {inject as injectService} from '@ember/service';
 import {isEmpty, typeOf} from '@ember/utils';
 import {run} from '@ember/runloop';
+import {inject as service} from '@ember/service';
 
 const MOBILEDOC_VERSION = '0.3.1';
 
@@ -27,9 +27,9 @@ export const BLANK_DOC = {
 
 export default Component.extend(ShortcutsMixin, {
 
-    config: injectService(),
+    config: service(),
-    notifications: injectService(),
+    notifications: service(),
-    settings: injectService(),
+    settings: service(),
 
     classNames: ['gh-markdown-editor'],
     classNameBindings: [

ghost/admin/app/components/gh-menu-toggle.js

@@ -1,7 +1,7 @@
 import Component from '@ember/component';
 import {computed} from '@ember/object';
-import {inject as injectService} from '@ember/service';
 import {reads} from '@ember/object/computed';
+import {inject as service} from '@ember/service';
 
 /*
     This cute little component has two jobs.
@@ -16,7 +16,7 @@ import {reads} from '@ember/object/computed';
 export default Component.extend({
     classNames: ['gh-menu-toggle'],
 
-    mediaQueries: injectService(),
+    mediaQueries: service(),
     isMobile: reads('mediaQueries.isMobile'),
     maximise: false,
 

ghost/admin/app/components/gh-mobile-nav-bar.js

@@ -1,8 +1,8 @@
 import Component from '@ember/component';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default Component.extend({
-    ui: injectService(),
+    ui: service(),
 
     tagName: 'nav',
     classNames: ['gh-mobile-nav-bar']

ghost/admin/app/components/gh-nav-menu.js

@@ -2,15 +2,15 @@ import Component from '@ember/component';
 import calculatePosition from 'ember-basic-dropdown/utils/calculate-position';
 import {computed} from '@ember/object';
 import {htmlSafe} from '@ember/string';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default Component.extend({
-    config: injectService(),
+    config: service(),
-    feature: injectService(),
+    feature: service(),
-    ghostPaths: injectService(),
+    ghostPaths: service(),
-    router: injectService('router'),
+    router: service('router'),
-    session: injectService(),
+    session: service(),
-    ui: injectService(),
+    ui: service(),
 
     tagName: 'nav',
     classNames: ['gh-nav'],

ghost/admin/app/components/gh-notification.js

@@ -1,6 +1,6 @@
 import Component from '@ember/component';
 import {computed} from '@ember/object';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default Component.extend({
     tagName: 'article',
@@ -9,7 +9,7 @@ export default Component.extend({
 
     message: null,
 
-    notifications: injectService(),
+    notifications: service(),
 
     typeClass: computed('message.type', function () {
         let type = this.get('message.type');

ghost/admin/app/components/gh-notifications.js

@@ -1,12 +1,12 @@
 import Component from '@ember/component';
 import {alias} from '@ember/object/computed';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default Component.extend({
     tagName: 'aside',
     classNames: 'gh-notifications',
 
-    notifications: injectService(),
+    notifications: service(),
 
     messages: alias('notifications.notifications')
 });

ghost/admin/app/components/gh-post-settings-menu.js

@@ -7,8 +7,8 @@ import {alias, or} from '@ember/object/computed';
 import {computed} from '@ember/object';
 import {guidFor} from '@ember/object/internals';
 import {htmlSafe} from '@ember/string';
-import {inject as injectService} from '@ember/service';
 import {run} from '@ember/runloop';
+import {inject as service} from '@ember/service';
 import {task, timeout} from 'ember-concurrency';
 
 const PSM_ANIMATION_LENGTH = 400;
@@ -17,14 +17,14 @@ export default Component.extend(SettingsMenuMixin, {
     selectedAuthor: null,
     authors: [],
 
-    store: injectService(),
+    store: service(),
-    config: injectService(),
+    config: service(),
-    ghostPaths: injectService(),
+    ghostPaths: service(),
-    notifications: injectService(),
+    notifications: service(),
-    slugGenerator: injectService(),
+    slugGenerator: service(),
-    session: injectService(),
+    session: service(),
-    settings: injectService(),
+    settings: service(),
-    ui: injectService(),
+    ui: service(),
 
     model: null,
 

ghost/admin/app/components/gh-posts-list-item.js

@@ -4,13 +4,13 @@ import Ember from 'ember';
 import {alias, equal} from '@ember/object/computed';
 import {computed} from '@ember/object';
 import {htmlSafe} from '@ember/string';
-import {inject as injectService} from '@ember/service';
 import {isBlank} from '@ember/utils';
+import {inject as service} from '@ember/service';
 
 const {Handlebars} = Ember;
 
 export default Component.extend({
-    ghostPaths: injectService(),
+    ghostPaths: service(),
 
     tagName: 'li',
     classNames: ['gh-posts-list-item'],

ghost/admin/app/components/gh-profile-image.js

@@ -2,7 +2,7 @@ import $ from 'jquery';
 import Component from '@ember/component';
 import request from 'ember-ajax/request';
 import {htmlSafe} from '@ember/string';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 import {task, timeout} from 'ember-concurrency';
 
 const ANIMATION_TIMEOUT = 1000;
@@ -32,8 +32,8 @@ export default Component.extend({
     // closure actions
     setImage() {},
 
-    config: injectService(),
+    config: service(),
-    ghostPaths: injectService(),
+    ghostPaths: service(),
 
     placeholderStyle: htmlSafe('background-image: url()'),
     avatarStyle: htmlSafe('display: none'),

ghost/admin/app/components/gh-psm-template-select.js

@@ -1,12 +1,12 @@
 import Component from '@ember/component';
 import {computed} from '@ember/object';
-import {inject as injectService} from '@ember/service';
 import {isEmpty} from '@ember/utils';
+import {inject as service} from '@ember/service';
 import {task} from 'ember-concurrency';
 
 export default Component.extend({
 
-    store: injectService(),
+    store: service(),
 
     // public attributes
     tagName: '',

ghost/admin/app/components/gh-publishmenu-scheduled.js

@@ -1,10 +1,10 @@
 import Component from '@ember/component';
 import moment from 'moment';
 import {computed} from '@ember/object';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default Component.extend({
-    clock: injectService(),
+    clock: service(),
 
     post: null,
     saveType: null,

ghost/admin/app/components/gh-publishmenu.js

@@ -1,12 +1,12 @@
 import $ from 'jquery';
 import Component from '@ember/component';
 import {computed} from '@ember/object';
-import {inject as injectService} from '@ember/service';
 import {reads} from '@ember/object/computed';
+import {inject as service} from '@ember/service';
 import {task} from 'ember-concurrency';
 
 export default Component.extend({
-    clock: injectService(),
+    clock: service(),
 
     classNames: 'gh-publishmenu',
     post: null,

ghost/admin/app/components/gh-search-input.js

@@ -3,9 +3,9 @@
 import Component from '@ember/component';
 import RSVP from 'rsvp';
 import {computed} from '@ember/object';
-import {inject as injectService} from '@ember/service';
 import {isBlank, isEmpty} from '@ember/utils';
 import {run} from '@ember/runloop';
+import {inject as service} from '@ember/service';
 
 export function computedGroup(category) {
     return computed('content', 'currentSearch', function () {
@@ -35,10 +35,10 @@ export default Component.extend({
     users: computedGroup('Users'),
     tags: computedGroup('Tags'),
 
-    _store: injectService('store'),
+    _store: service('store'),
-    router: injectService('router'),
+    router: service('router'),
-    ajax: injectService(),
+    ajax: service(),
-    notifications: injectService(),
+    notifications: service(),
 
     refreshContent() {
         let promises = [];

ghost/admin/app/components/gh-tag-settings-form.js

@@ -4,9 +4,9 @@ import Ember from 'ember';
 import boundOneWay from 'ghost-admin/utils/bound-one-way';
 import {computed} from '@ember/object';
 import {htmlSafe} from '@ember/string';
-import {inject as injectService} from '@ember/service';
 import {invokeAction} from 'ember-invoke-action';
 import {reads} from '@ember/object/computed';
+import {inject as service} from '@ember/service';
 
 const {Handlebars} = Ember;
 
@@ -22,9 +22,9 @@ export default Component.extend({
 
     isViewingSubview: false,
 
-    feature: injectService(),
+    feature: service(),
-    config: injectService(),
+    config: service(),
-    mediaQueries: injectService(),
+    mediaQueries: service(),
 
     isMobile: reads('mediaQueries.maxWidth600'),
 

ghost/admin/app/components/gh-tags-management-container.js

@@ -1,16 +1,16 @@
 import Component from '@ember/component';
 import {computed} from '@ember/object';
 import {equal, reads} from '@ember/object/computed';
-import {inject as injectService} from '@ember/service';
 import {isBlank} from '@ember/utils';
 import {observer} from '@ember/object';
 import {run} from '@ember/runloop';
+import {inject as service} from '@ember/service';
 
 export default Component.extend({
     classNames: ['view-container'],
     classNameBindings: ['isMobile'],
 
-    mediaQueries: injectService(),
+    mediaQueries: service(),
 
     tags: null,
     selectedTag: null,

ghost/admin/app/components/gh-textarea.js

@@ -1,10 +1,10 @@
 import OneWayTextarea from 'ember-one-way-controls/components/one-way-textarea';
 import TextInputMixin from 'ghost-admin/mixins/text-input';
-import {inject as injectService} from '@ember/service';
 import {run} from '@ember/runloop';
+import {inject as service} from '@ember/service';
 
 export default OneWayTextarea.extend(TextInputMixin, {
-    resizeDetector: injectService(),
+    resizeDetector: service(),
 
     classNames: 'gh-input',
 

ghost/admin/app/components/gh-timezone-select.js

@@ -1,9 +1,9 @@
 import Component from '@ember/component';
 import moment from 'moment';
 import {computed} from '@ember/object';
-import {inject as injectService} from '@ember/service';
 import {invokeAction} from 'ember-invoke-action';
 import {mapBy} from '@ember/object/computed';
+import {inject as service} from '@ember/service';
 
 export default Component.extend({
     classNames: ['form-group', 'for-select'],
@@ -11,7 +11,7 @@ export default Component.extend({
     activeTimezone: null,
     availableTimezones: null,
 
-    clock: injectService(),
+    clock: service(),
 
     availableTimezoneNames: mapBy('availableTimezones', 'name'),
 

ghost/admin/app/components/gh-tour-item.js

@@ -1,9 +1,9 @@
 import Component from '@ember/component';
 import {computed} from '@ember/object';
-import {inject as injectService} from '@ember/service';
 import {isBlank} from '@ember/utils';
 import {reads} from '@ember/object/computed';
 import {run} from '@ember/runloop';
+import {inject as service} from '@ember/service';
 
 let instancesCounter = 0;
 
@@ -68,8 +68,8 @@ let triangleClassPositions = {
 
 const GhTourItemComponent = Component.extend({
 
-    mediaQueries: injectService(),
+    mediaQueries: service(),
-    tour: injectService(),
+    tour: service(),
 
     tagName: '',
 

ghost/admin/app/components/gh-unsplash.js

@@ -1,16 +1,16 @@
 import Component from '@ember/component';
 import ShortcutsMixin from 'ghost-admin/mixins/shortcuts';
 import {bind} from '@ember/runloop';
-import {inject as injectService} from '@ember/service';
 import {or} from '@ember/object/computed';
+import {inject as service} from '@ember/service';
 
 const ONE_COLUMN_WIDTH = 540;
 const TWO_COLUMN_WIDTH = 940;
 
 export default Component.extend(ShortcutsMixin, {
-    resizeDetector: injectService(),
+    resizeDetector: service(),
-    unsplash: injectService(),
+    unsplash: service(),
-    ui: injectService(),
+    ui: service(),
 
     tagName: '',
     zoomedPhoto: null,

ghost/admin/app/components/gh-upgrade-notification.js

@@ -1,13 +1,13 @@
 import Component from '@ember/component';
 import {alias} from '@ember/object/computed';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default Component.extend({
     tagName: 'section',
 
     classNames: ['gh-upgrade-notification'],
 
-    upgradeNotification: injectService('upgrade-notification'),
+    upgradeNotification: service('upgrade-notification'),
 
     message: alias('upgradeNotification.content')
 });

ghost/admin/app/components/gh-uploader.js

@@ -2,10 +2,10 @@ import Component from '@ember/component';
 import EmberObject from '@ember/object';
 import ghostPaths from 'ghost-admin/utils/ghost-paths';
 import {all, task} from 'ember-concurrency';
-import {inject as injectService} from '@ember/service';
 import {isArray as isEmberArray} from '@ember/array';
 import {isEmpty} from '@ember/utils';
 import {run} from '@ember/runloop';
+import {inject as service} from '@ember/service';
 
 // TODO: this is designed to be a more re-usable/composable upload component, it
 // should be able to replace the duplicated upload logic in:
@@ -45,7 +45,7 @@ const UploadTracker = EmberObject.extend({
 export default Component.extend({
     tagName: '',
 
-    ajax: injectService(),
+    ajax: service(),
 
     // Public attributes
     accept: '',

ghost/admin/app/components/gh-url-preview.js

@@ -1,6 +1,6 @@
 import Component from '@ember/component';
 import {computed} from '@ember/object';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 /*
 Example usage:
@@ -11,7 +11,7 @@ export default Component.extend({
     prefix: null,
     slug: null,
 
-    config: injectService(),
+    config: service(),
 
     url: computed('slug', function () {
         // Get the blog URL and strip the scheme

ghost/admin/app/components/gh-user-active.js

@@ -3,7 +3,7 @@ import Ember from 'ember';
 import moment from 'moment';
 import {computed} from '@ember/object';
 import {htmlSafe} from '@ember/string';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 const {Handlebars} = Ember;
 
@@ -12,7 +12,7 @@ export default Component.extend({
 
     user: null,
 
-    ghostPaths: injectService(),
+    ghostPaths: service(),
 
     userDefault: computed('ghostPaths', function () {
         return `${this.get('ghostPaths.assetRoot')}/img/user-image.png`;

ghost/admin/app/components/gh-view-title.js

@@ -1,8 +1,8 @@
 import Component from '@ember/component';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default Component.extend({
-    ui: injectService(),
+    ui: service(),
 
     tagName: 'h2',
     classNames: ['view-title']

ghost/admin/app/components/modal-delete-all.js

@@ -1,13 +1,13 @@
 import ModalComponent from 'ghost-admin/components/modal-base';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 import {task} from 'ember-concurrency';
 
 export default ModalComponent.extend({
 
-    ghostPaths: injectService(),
+    ghostPaths: service(),
-    notifications: injectService(),
+    notifications: service(),
-    store: injectService(),
+    store: service(),
-    ajax: injectService(),
+    ajax: service(),
 
     _deleteAll() {
         let deleteUrl = this.get('ghostPaths.url').api('db');

ghost/admin/app/components/modal-delete-post.js

@@ -1,6 +1,6 @@
 import ModalComponent from 'ghost-admin/components/modal-base';
 import {alias} from '@ember/object/computed';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 import {task} from 'ember-concurrency';
 
 export default ModalComponent.extend({
@@ -8,7 +8,7 @@ export default ModalComponent.extend({
     post: alias('model.post'),
     onSuccess: alias('model.onSuccess'),
 
-    notifications: injectService(),
+    notifications: service(),
 
     _deletePost() {
         let post = this.get('post');

ghost/admin/app/components/modal-invite-new-user.js

@@ -2,8 +2,8 @@ import ModalComponent from 'ghost-admin/components/modal-base';
 import RSVP from 'rsvp';
 import ValidationEngine from 'ghost-admin/mixins/validation-engine';
 import {A as emberA} from '@ember/array';
-import {inject as injectService} from '@ember/service';
 import {run} from '@ember/runloop';
+import {inject as service} from '@ember/service';
 import {task} from 'ember-concurrency';
 
 const {Promise} = RSVP;
@@ -17,8 +17,8 @@ export default ModalComponent.extend(ValidationEngine, {
 
     validationType: 'inviteUser',
 
-    notifications: injectService(),
+    notifications: service(),
-    store: injectService(),
+    store: service(),
 
     init() {
         this._super(...arguments);

ghost/admin/app/components/modal-re-authenticate.js

@@ -3,8 +3,8 @@ import ModalComponent from 'ghost-admin/components/modal-base';
 import ValidationEngine from 'ghost-admin/mixins/validation-engine';
 import {computed} from '@ember/object';
 import {htmlSafe} from '@ember/string';
-import {inject as injectService} from '@ember/service';
 import {isVersionMismatchError} from 'ghost-admin/services/ajax';
+import {inject as service} from '@ember/service';
 import {task} from 'ember-concurrency';
 
 export default ModalComponent.extend(ValidationEngine, {
@@ -12,9 +12,9 @@ export default ModalComponent.extend(ValidationEngine, {
 
     authenticationError: null,
 
-    config: injectService(),
+    config: service(),
-    notifications: injectService(),
+    notifications: service(),
-    session: injectService(),
+    session: service(),
 
     identification: computed('session.user.email', function () {
         return this.get('session.user.email');

ghost/admin/app/components/modal-upload-image.js

@@ -1,8 +1,8 @@
 import ModalComponent from 'ghost-admin/components/modal-base';
 import cajaSanitizers from 'ghost-admin/utils/caja-sanitizers';
 import {computed} from '@ember/object';
-import {inject as injectService} from '@ember/service';
 import {isEmpty} from '@ember/utils';
+import {inject as service} from '@ember/service';
 import {task} from 'ember-concurrency';
 
 export default ModalComponent.extend({
@@ -12,8 +12,8 @@ export default ModalComponent.extend({
     newUrl: '',
     _isUploading: false,
 
-    config: injectService(),
+    config: service(),
-    notifications: injectService(),
+    notifications: service(),
 
     image: computed('model.model', 'model.imageProperty', {
         get() {

ghost/admin/app/components/modal-upload-theme.js

@@ -6,10 +6,10 @@ import {
 } from 'ghost-admin/services/ajax';
 import {computed} from '@ember/object';
 import {get} from '@ember/object';
-import {inject as injectService} from '@ember/service';
 import {invokeAction} from 'ember-invoke-action';
 import {mapBy, or} from '@ember/object/computed';
 import {run} from '@ember/runloop';
+import {inject as service} from '@ember/service';
 
 export default ModalComponent.extend({
 
@@ -21,8 +21,8 @@ export default ModalComponent.extend({
     theme: false,
     displayOverwriteWarning: false,
 
-    eventBus: injectService(),
+    eventBus: service(),
-    store: injectService(),
+    store: service(),
 
     hideUploader: or('theme', 'displayOverwriteWarning'),
 

ghost/admin/app/controllers/application.js

@@ -1,12 +1,12 @@
 import Controller from '@ember/controller';
 import {computed} from '@ember/object';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default Controller.extend({
-    dropdown: injectService(),
+    dropdown: service(),
-    session: injectService(),
+    session: service(),
-    settings: injectService(),
+    settings: service(),
-    ui: injectService(),
+    ui: service(),
 
     showNavMenu: computed('currentPath', 'session.isAuthenticated', 'session.user.isFulfilled', function () {
         // we need to defer showing the navigation menu until the session.user

ghost/admin/app/controllers/posts-loading.js

@@ -1,12 +1,11 @@
-import Controller from '@ember/controller';
+import Controller, {inject as controller} from '@ember/controller';
-import {inject as injectController} from '@ember/controller';
-import {inject as injectService} from '@ember/service';
 import {readOnly} from '@ember/object/computed';
+import {inject as service} from '@ember/service';
 
 export default Controller.extend({
 
-    postsController: injectController('posts'),
+    postsController: controller('posts'),
-    session: injectService(),
+    session: service(),
 
     availableTypes: readOnly('postsController.availableTypes'),
     selectedType: readOnly('postsController.selectedType'),

ghost/admin/app/controllers/posts.js

@@ -1,12 +1,12 @@
 import Controller from '@ember/controller';
 import {computed} from '@ember/object';
 import {get} from '@ember/object';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default Controller.extend({
 
-    session: injectService(),
+    session: service(),
-    store: injectService(),
+    store: service(),
 
     queryParams: ['type', 'author', 'tag', 'order'],
     type: null,

ghost/admin/app/controllers/reset.js

@@ -1,7 +1,7 @@
 import Controller from '@ember/controller';
 import ValidationEngine from 'ghost-admin/mixins/validation-engine';
 import {computed} from '@ember/object';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 import {task} from 'ember-concurrency';
 
 export default Controller.extend(ValidationEngine, {
@@ -12,11 +12,11 @@ export default Controller.extend(ValidationEngine, {
 
     validationType: 'reset',
 
-    ghostPaths: injectService(),
+    ghostPaths: service(),
-    notifications: injectService(),
+    notifications: service(),
-    session: injectService(),
+    session: service(),
-    ajax: injectService(),
+    ajax: service(),
-    config: injectService(),
+    config: service(),
 
     email: computed('token', function () {
         // The token base64 encodes the email (and some other stuff),

ghost/admin/app/controllers/settings/apps/amp.js

@@ -1,11 +1,11 @@
 import Controller from '@ember/controller';
 import {alias} from '@ember/object/computed';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 import {task} from 'ember-concurrency';
 
 export default Controller.extend({
-    notifications: injectService(),
+    notifications: service(),
-    settings: injectService(),
+    settings: service(),
 
     model: alias('settings.amp'),
 

ghost/admin/app/controllers/settings/apps/index.js

@@ -1,6 +1,6 @@
 import Controller from '@ember/controller';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default Controller.extend({
-    settings: injectService()
+    settings: service()
 });

ghost/admin/app/controllers/settings/apps/slack.js

@@ -1,15 +1,15 @@
 import Controller from '@ember/controller';
 import {alias} from '@ember/object/computed';
 import {empty} from '@ember/object/computed';
-import {inject as injectService} from '@ember/service';
 import {isInvalidError} from 'ember-ajax/errors';
+import {inject as service} from '@ember/service';
 import {task} from 'ember-concurrency';
 
 export default Controller.extend({
-    ghostPaths: injectService(),
+    ghostPaths: service(),
-    ajax: injectService(),
+    ajax: service(),
-    notifications: injectService(),
+    notifications: service(),
-    settings: injectService(),
+    settings: service(),
 
     model: alias('settings.slack.firstObject'),
     testNotificationDisabled: empty('model.url'),

ghost/admin/app/controllers/settings/apps/unsplash.js

@@ -1,11 +1,11 @@
 import Controller from '@ember/controller';
 import {alias} from '@ember/object/computed';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 import {task} from 'ember-concurrency';
 
 export default Controller.extend({
-    notifications: injectService(),
+    notifications: service(),
-    settings: injectService(),
+    settings: service(),
 
     model: alias('settings.unsplash'),
 

ghost/admin/app/controllers/settings/code-injection.js

@@ -1,9 +1,9 @@
 import Controller from '@ember/controller';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 import {task} from 'ember-concurrency';
 
 export default Controller.extend({
-    notifications: injectService(),
+    notifications: service(),
 
     save: task(function* () {
         let notifications = this.get('notifications');

ghost/admin/app/controllers/settings/design.js

@@ -3,17 +3,17 @@ import Controller from '@ember/controller';
 import NavigationItem from 'ghost-admin/models/navigation-item';
 import RSVP from 'rsvp';
 import {computed} from '@ember/object';
-import {inject as injectService} from '@ember/service';
 import {isEmpty} from '@ember/utils';
 import {isThemeValidationError} from 'ghost-admin/services/ajax';
 import {notEmpty} from '@ember/object/computed';
+import {inject as service} from '@ember/service';
 import {task} from 'ember-concurrency';
 
 export default Controller.extend({
-    config: injectService(),
+    config: service(),
-    ghostPaths: injectService(),
+    ghostPaths: service(),
-    notifications: injectService(),
+    notifications: service(),
-    session: injectService(),
+    session: service(),
 
     newNavItem: null,
 

ghost/admin/app/controllers/settings/general.js

@@ -6,16 +6,16 @@ import {
     IMAGE_MIME_TYPES
 } from 'ghost-admin/components/gh-image-uploader';
 import {computed} from '@ember/object';
-import {inject as injectService} from '@ember/service';
 import {observer} from '@ember/object';
 import {run} from '@ember/runloop';
+import {inject as service} from '@ember/service';
 import {task} from 'ember-concurrency';
 
 export default Controller.extend({
-    config: injectService(),
+    config: service(),
-    ghostPaths: injectService(),
+    ghostPaths: service(),
-    notifications: injectService(),
+    notifications: service(),
-    session: injectService(),
+    session: service(),
 
     availableTimezones: null,
     iconExtensions: ['ico', 'png'],

ghost/admin/app/controllers/settings/labs.js

@@ -7,10 +7,10 @@ import {
     isRequestEntityTooLargeError,
     isUnsupportedMediaTypeError
 } from 'ghost-admin/services/ajax';
-import {inject as injectService} from '@ember/service';
 import {isBlank} from '@ember/utils';
 import {isArray as isEmberArray} from '@ember/array';
 import {run} from '@ember/runloop';
+import {inject as service} from '@ember/service';
 import {task, timeout} from 'ember-concurrency';
 
 const {testing} = Ember;
@@ -27,12 +27,12 @@ export default Controller.extend({
     jsonExtension: ['json'],
     jsonMimeType: ['application/json'],
 
-    ajax: injectService(),
+    ajax: service(),
-    config: injectService(),
+    config: service(),
-    ghostPaths: injectService(),
+    ghostPaths: service(),
-    notifications: injectService(),
+    notifications: service(),
-    session: injectService(),
+    session: service(),
-    settings: injectService(),
+    settings: service(),
 
     // TODO: convert to ember-concurrency task
     _validate(file) {

ghost/admin/app/controllers/settings/tags.js

@@ -1,11 +1,10 @@
-import Controller from '@ember/controller';
+import Controller, {inject as controller} from '@ember/controller';
 import {alias, equal, sort} from '@ember/object/computed';
-import {inject as injectController} from '@ember/controller';
 import {run} from '@ember/runloop';
 
 export default Controller.extend({
 
-    tagController: injectController('settings.tags.tag'),
+    tagController: controller('settings.tags.tag'),
 
     selectedTag: alias('tagController.tag'),
 

ghost/admin/app/controllers/settings/tags/tag.js

@@ -1,7 +1,6 @@
-import Controller from '@ember/controller';
+import Controller, {inject as controller} from '@ember/controller';
 import {alias} from '@ember/object/computed';
-import {inject as injectController} from '@ember/controller';
+import {inject as service} from '@ember/service';
-import {inject as injectService} from '@ember/service';
 
 export default Controller.extend({
 
@@ -10,9 +9,9 @@ export default Controller.extend({
     tag: alias('model'),
     isMobile: alias('tagsController.isMobile'),
 
-    applicationController: injectController('application'),
+    applicationController: controller('application'),
-    tagsController: injectController('settings.tags'),
+    tagsController: controller('settings.tags'),
-    notifications: injectService(),
+    notifications: service(),
 
     _saveTagProperty(propKey, newValue) {
         let tag = this.get('tag');

ghost/admin/app/controllers/setup.js

@@ -1,12 +1,11 @@
-import Controller from '@ember/controller';
+import Controller, {inject as controller} from '@ember/controller';
 import {computed} from '@ember/object';
-import {inject as injectController} from '@ember/controller';
-import {inject as injectService} from '@ember/service';
 import {match} from '@ember/object/computed';
+import {inject as service} from '@ember/service';
 
 export default Controller.extend({
-    appController: injectController('application'),
+    appController: controller('application'),
-    ghostPaths: injectService(),
+    ghostPaths: service(),
 
     showBackLink: match('appController.currentRouteName', /^setup\.(two|three)$/),
 

ghost/admin/app/controllers/setup/three.js

@@ -1,21 +1,20 @@
-import Controller from '@ember/controller';
+import Controller, {inject as controller} from '@ember/controller';
 import DS from 'ember-data';
 import RSVP from 'rsvp';
 import {alias} from '@ember/object/computed';
 import {computed} from '@ember/object';
 import {A as emberA} from '@ember/array';
 import {htmlSafe} from '@ember/string';
-import {inject as injectController} from '@ember/controller';
-import {inject as injectService} from '@ember/service';
 import {isInvalidError} from 'ember-ajax/errors';
 import {run} from '@ember/runloop';
+import {inject as service} from '@ember/service';
 import {task, timeout} from 'ember-concurrency';
 
 const {Errors} = DS;
 
 export default Controller.extend({
-    notifications: injectService(),
+    notifications: service(),
-    two: injectController('setup/two'),
+    two: controller('setup/two'),
 
     errors: Errors.create(),
     hasValidated: emberA(),

ghost/admin/app/controllers/setup/two.js

@@ -1,21 +1,20 @@
 /* eslint-disable camelcase */
-import Controller from '@ember/controller';
+import Controller, {inject as controller} from '@ember/controller';
 import RSVP from 'rsvp';
 import ValidationEngine from 'ghost-admin/mixins/validation-engine';
-import {inject as injectController} from '@ember/controller';
-import {inject as injectService} from '@ember/service';
 import {isInvalidError} from 'ember-ajax/errors';
 import {isVersionMismatchError} from 'ghost-admin/services/ajax';
+import {inject as service} from '@ember/service';
 import {task} from 'ember-concurrency';
 
 export default Controller.extend(ValidationEngine, {
-    ajax: injectService(),
+    ajax: service(),
-    application: injectController(),
+    application: controller(),
-    config: injectService(),
+    config: service(),
-    ghostPaths: injectService(),
+    ghostPaths: service(),
-    notifications: injectService(),
+    notifications: service(),
-    session: injectService(),
+    session: service(),
-    settings: injectService(),
+    settings: service(),
 
     // ValidationEngine settings
     validationType: 'setup',

ghost/admin/app/controllers/signin.js

@@ -1,11 +1,10 @@
 import $ from 'jquery';
-import Controller from '@ember/controller';
+import Controller, {inject as controller} from '@ember/controller';
 import RSVP from 'rsvp';
 import ValidationEngine from 'ghost-admin/mixins/validation-engine';
-import {inject as injectController} from '@ember/controller';
-import {inject as injectService} from '@ember/service';
 import {isArray as isEmberArray} from '@ember/array';
 import {isVersionMismatchError} from 'ghost-admin/services/ajax';
+import {inject as service} from '@ember/service';
 import {task} from 'ember-concurrency';
 
 export default Controller.extend(ValidationEngine, {
@@ -13,13 +12,13 @@ export default Controller.extend(ValidationEngine, {
     loggingIn: false,
     authProperties: ['identification', 'password'],
 
-    ajax: injectService(),
+    ajax: service(),
-    application: injectController(),
+    application: controller(),
-    config: injectService(),
+    config: service(),
-    ghostPaths: injectService(),
+    ghostPaths: service(),
-    notifications: injectService(),
+    notifications: service(),
-    session: injectService(),
+    session: service(),
-    settings: injectService(),
+    settings: service(),
 
     flowErrors: '',
 

ghost/admin/app/controllers/signup.js

@@ -5,17 +5,17 @@ import {
     VersionMismatchError,
     isVersionMismatchError
 } from 'ghost-admin/services/ajax';
-import {inject as injectService} from '@ember/service';
 import {isArray as isEmberArray} from '@ember/array';
+import {inject as service} from '@ember/service';
 import {task} from 'ember-concurrency';
 
 export default Controller.extend(ValidationEngine, {
-    ajax: injectService(),
+    ajax: service(),
-    config: injectService(),
+    config: service(),
-    ghostPaths: injectService(),
+    ghostPaths: service(),
-    notifications: injectService(),
+    notifications: service(),
-    session: injectService(),
+    session: service(),
-    settings: injectService(),
+    settings: service(),
 
     // ValidationEngine settings
     validationType: 'signup',

ghost/admin/app/controllers/subscribers.js

@@ -5,7 +5,7 @@ import Table from 'ember-light-table';
 import ghostPaths from 'ghost-admin/utils/ghost-paths';
 import {assign} from '@ember/polyfills';
 import {computed} from '@ember/object';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default Controller.extend(PaginationMixin, {
 
@@ -19,7 +19,7 @@ export default Controller.extend(PaginationMixin, {
     table: null,
     subscriberToDelete: null,
 
-    session: injectService(),
+    session: service(),
 
     // paginationSettings is replaced by the pagination mixin so we need a
     // getter/setter CP here so that we don't lose the dynamic order param

ghost/admin/app/controllers/team/index.js

@@ -1,5 +1,5 @@
 import Controller from '@ember/controller';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 import {sort} from '@ember/object/computed';
 
 export default Controller.extend({
@@ -10,7 +10,7 @@ export default Controller.extend({
     suspendedUsers: null,
     invites: null,
 
-    session: injectService(),
+    session: service(),
 
     inviteOrder: ['email'],
     sortedInvites: sort('invites', 'inviteOrder'),

ghost/admin/app/controllers/team/user.js

@@ -5,9 +5,9 @@ import isNumber from 'ghost-admin/utils/isNumber';
 import {alias, and, not, or, readOnly} from '@ember/object/computed';
 import {computed} from '@ember/object';
 import {htmlSafe} from '@ember/string';
-import {inject as injectService} from '@ember/service';
 import {isArray as isEmberArray} from '@ember/array';
 import {run} from '@ember/runloop';
+import {inject as service} from '@ember/service';
 import {task, taskGroup} from 'ember-concurrency';
 
 // ember-cli-shims doesn't export this
@@ -22,13 +22,13 @@ export default Controller.extend({
     _scratchFacebook: null,
     _scratchTwitter: null,
 
-    ajax: injectService(),
+    ajax: service(),
-    config: injectService(),
+    config: service(),
-    dropdown: injectService(),
+    dropdown: service(),
-    ghostPaths: injectService(),
+    ghostPaths: service(),
-    notifications: injectService(),
+    notifications: service(),
-    session: injectService(),
+    session: service(),
-    slugGenerator: injectService(),
+    slugGenerator: service(),
 
     user: alias('model'),
     currentUser: alias('session.user'),

ghost/admin/app/helpers/gh-format-post-time.js

@@ -1,10 +1,10 @@
 import Helper from '@ember/component/helper';
 import moment from 'moment';
 import {assert} from '@ember/debug';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default Helper.extend({
-    settings: injectService(),
+    settings: service(),
 
     compute([timeago], {draft, scheduled, published}) {
         assert(timeago, 'You must pass a time to the gh-format-post-time helper');

ghost/admin/app/mixins/editor-base-controller.js

@@ -6,14 +6,14 @@ import ghostPaths from 'ghost-admin/utils/ghost-paths';
 import isNumber from 'ghost-admin/utils/isNumber';
 import moment from 'moment';
 import {computed} from '@ember/object';
+import {inject as controller} from '@ember/controller';
 import {htmlSafe} from '@ember/string';
-import {inject as injectController} from '@ember/controller';
-import {inject as injectService} from '@ember/service';
 import {isBlank} from '@ember/utils';
 import {isArray as isEmberArray} from '@ember/array';
 import {isInvalidError} from 'ember-ajax/errors';
 import {isVersionMismatchError} from 'ghost-admin/services/ajax';
 import {mapBy, reads} from '@ember/object/computed';
+import {inject as service} from '@ember/service';
 import {task, taskGroup, timeout} from 'ember-concurrency';
 
 // ember-cli-shims doesn't export Ember.testing
@@ -41,11 +41,11 @@ export default Mixin.create({
     showDeletePostModal: false,
     shouldFocusEditor: true,
 
-    application: injectController(),
+    application: controller(),
-    notifications: injectService(),
+    notifications: service(),
-    clock: injectService(),
+    clock: service(),
-    slugGenerator: injectService(),
+    slugGenerator: service(),
-    ui: injectService(),
+    ui: service(),
 
     wordcount: 0,
     cards: [], // for apps

ghost/admin/app/mixins/pagination.js

@@ -2,7 +2,7 @@ import Mixin from '@ember/object/mixin';
 import RSVP from 'rsvp';
 import {assign} from '@ember/polyfills';
 import {computed} from '@ember/object';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 let defaultPaginationSettings = {
     page: 1,
@@ -10,7 +10,7 @@ let defaultPaginationSettings = {
 };
 
 export default Mixin.create({
-    notifications: injectService(),
+    notifications: service(),
 
     paginationModel: null,
     paginationSettings: null,

ghost/admin/app/mixins/unauthenticated-route-mixin.js

@@ -1,11 +1,11 @@
 import Mixin from '@ember/object/mixin';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default Mixin.create({
 
-    ajax: injectService(),
+    ajax: service(),
-    ghostPaths: injectService(),
+    ghostPaths: service(),
-    session: injectService(),
+    session: service(),
 
     routeIfAlreadyAuthenticated: 'posts',
 

ghost/admin/app/models/invite.js

@@ -2,7 +2,7 @@
 import Model from 'ember-data/model';
 import attr from 'ember-data/attr';
 import {belongsTo} from 'ember-data/relationships';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default Model.extend({
     token: attr('string'),
@@ -15,8 +15,8 @@ export default Model.extend({
     status: attr('string'),
     role: belongsTo('role', {async: false}),
 
-    ajax: injectService(),
+    ajax: service(),
-    ghostPaths: injectService(),
+    ghostPaths: service(),
 
     resend() {
         let fullInviteData = this.toJSON();

ghost/admin/app/models/post.js

@@ -9,9 +9,9 @@ import {belongsTo, hasMany} from 'ember-data/relationships';
 import {compare} from '@ember/utils';
 import {computed} from '@ember/object';
 import {equal, filterBy} from '@ember/object/computed';
-import {inject as injectService} from '@ember/service';
 import {isBlank} from '@ember/utils';
 import {observer} from '@ember/object';
+import {inject as service} from '@ember/service';
 
 // ember-cli-shims doesn't export these so we must get them manually
 const {Comparable} = Ember;
@@ -68,10 +68,10 @@ function publishedAtCompare(postA, postB) {
 }
 
 export default Model.extend(Comparable, ValidationEngine, {
-    config: injectService(),
+    config: service(),
-    ghostPaths: injectService(),
+    ghostPaths: service(),
-    clock: injectService(),
+    clock: service(),
-    settings: injectService(),
+    settings: service(),
 
     validationType: 'post',
 

ghost/admin/app/models/tag.js

@@ -5,8 +5,8 @@ import attr from 'ember-data/attr';
 import {computed} from '@ember/object';
 import {equal} from '@ember/object/computed';
 import {guidFor} from '@ember/object/internals';
-import {inject as injectService} from '@ember/service';
 import {observer} from '@ember/object';
+import {inject as service} from '@ember/service';
 
 export default Model.extend(ValidationEngine, {
     validationType: 'tag',
@@ -28,7 +28,7 @@ export default Model.extend(ValidationEngine, {
     isInternal: equal('visibility', 'internal'),
     isPublic: equal('visibility', 'public'),
 
-    feature: injectService(),
+    feature: service(),
 
     // HACK: ugly hack to main compatibility with selectize as used in the
     // PSM tags input

ghost/admin/app/models/user.js

@@ -5,7 +5,7 @@ import attr from 'ember-data/attr';
 import {computed} from '@ember/object';
 import {equal} from '@ember/object/computed';
 import {hasMany} from 'ember-data/relationships';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 import {task} from 'ember-concurrency';
 
 export default Model.extend(ValidationEngine, {
@@ -38,11 +38,11 @@ export default Model.extend(ValidationEngine, {
     twitter: attr('twitter-url-user'),
     tour: attr('json-string'),
 
-    ghostPaths: injectService(),
+    ghostPaths: service(),
-    ajax: injectService(),
+    ajax: service(),
-    session: injectService(),
+    session: service(),
-    notifications: injectService(),
+    notifications: service(),
-    config: injectService(),
+    config: service(),
 
     // TODO: Once client-side permissions are in place,
     // remove the hard role check.

ghost/admin/app/router.js

@@ -2,14 +2,14 @@ import EmberRouter from '@ember/routing/router';
 import config from './config/environment';
 import documentTitle from 'ghost-admin/utils/document-title';
 import ghostPaths from 'ghost-admin/utils/ghost-paths';
-import {inject as injectService} from '@ember/service';
 import {on} from '@ember/object/evented';
+import {inject as service} from '@ember/service';
 
 const Router = EmberRouter.extend({
     location: config.locationType, // use HTML5 History API instead of hash-tag based URLs
     rootURL: ghostPaths().adminRoot, // admin interface lives under sub-directory /ghost
 
-    notifications: injectService(),
+    notifications: service(),
 
     displayDelayedNotifications: on('didTransition', function () {
         this.get('notifications').displayDelayed();

ghost/admin/app/routes/about.js

@@ -1,14 +1,14 @@
 import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
 import styleBody from 'ghost-admin/mixins/style-body';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default AuthenticatedRoute.extend(styleBody, {
     titleToken: 'About',
 
     classNames: ['view-about'],
 
-    ghostPaths: injectService(),
+    ghostPaths: service(),
-    ajax: injectService(),
+    ajax: service(),
 
     cachedConfig: false,
 

ghost/admin/app/routes/application.js

@@ -8,11 +8,11 @@ import ctrlOrCmd from 'ghost-admin/utils/ctrl-or-cmd';
 import moment from 'moment';
 import windowProxy from 'ghost-admin/utils/window-proxy';
 import {htmlSafe} from '@ember/string';
-import {inject as injectService} from '@ember/service';
 import {isArray as isEmberArray} from '@ember/array';
 import {isUnauthorizedError} from 'ember-ajax/errors';
 import {observer} from '@ember/object';
 import {run} from '@ember/runloop';
+import {inject as service} from '@ember/service';
 
 function K() {
     return this;
@@ -28,14 +28,14 @@ export default Route.extend(ApplicationRouteMixin, ShortcutsRoute, {
 
     routeAfterAuthentication: 'posts',
 
-    config: injectService(),
+    config: service(),
-    feature: injectService(),
+    feature: service(),
-    lazyLoader: injectService(),
+    lazyLoader: service(),
-    notifications: injectService(),
+    notifications: service(),
-    settings: injectService(),
+    settings: service(),
-    upgradeNotification: injectService(),
+    upgradeNotification: service(),
-    tour: injectService(),
+    tour: service(),
-    ui: injectService(),
+    ui: service(),
 
     beforeModel() {
         return this.get('config').fetch();

ghost/admin/app/routes/reset.js

@@ -1,13 +1,13 @@
 import Route from '@ember/routing/route';
 import UnauthenticatedRouteMixin from 'ghost-admin/mixins/unauthenticated-route-mixin';
 import styleBody from 'ghost-admin/mixins/style-body';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default Route.extend(styleBody, UnauthenticatedRouteMixin, {
     classNames: ['ghost-reset'],
 
-    notifications: injectService(),
+    notifications: service(),
-    session: injectService(),
+    session: service(),
 
     beforeModel() {
         if (this.get('session.isAuthenticated')) {

ghost/admin/app/routes/settings/apps.js

@@ -1,10 +1,10 @@
 import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
 import CurrentUserSettings from 'ghost-admin/mixins/current-user-settings';
 import styleBody from 'ghost-admin/mixins/style-body';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
-    settings: injectService(),
+    settings: service(),
 
     titleToken: 'Settings - Apps',
     classNames: ['settings-view-apps'],

ghost/admin/app/routes/settings/apps/unsplash.js

@@ -1,11 +1,11 @@
 import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
 import UnsplashObject from 'ghost-admin/models/unsplash-integration';
 import styleBody from 'ghost-admin/mixins/style-body';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default AuthenticatedRoute.extend(styleBody, {
-    config: injectService(),
+    config: service(),
-    settings: injectService(),
+    settings: service(),
 
     titleToken: 'Settings - Apps - Unsplash',
     classNames: ['settings-view-apps-unsplash'],

ghost/admin/app/routes/settings/code-injection.js

@@ -1,13 +1,13 @@
 import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
 import CurrentUserSettings from 'ghost-admin/mixins/current-user-settings';
 import styleBody from 'ghost-admin/mixins/style-body';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
     titleToken: 'Settings - Code injection',
     classNames: ['settings-view-code'],
 
-    settings: injectService(),
+    settings: service(),
 
     beforeModel() {
         this._super(...arguments);

ghost/admin/app/routes/settings/design.js

@@ -3,10 +3,10 @@ import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
 import CurrentUserSettings from 'ghost-admin/mixins/current-user-settings';
 import RSVP from 'rsvp';
 import styleBody from 'ghost-admin/mixins/style-body';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
-    settings: injectService(),
+    settings: service(),
 
     titleToken: 'Settings - Design',
     classNames: ['settings-view-design'],

ghost/admin/app/routes/settings/general.js

@@ -2,11 +2,11 @@ import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
 import CurrentUserSettings from 'ghost-admin/mixins/current-user-settings';
 import RSVP from 'rsvp';
 import styleBody from 'ghost-admin/mixins/style-body';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
-    config: injectService(),
+    config: service(),
-    settings: injectService(),
+    settings: service(),
 
     titleToken: 'Settings - General',
     classNames: ['settings-view-general'],

ghost/admin/app/routes/settings/labs.js

@@ -1,10 +1,10 @@
 import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
 import CurrentUserSettings from 'ghost-admin/mixins/current-user-settings';
 import styleBody from 'ghost-admin/mixins/style-body';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
-    settings: injectService(),
+    settings: service(),
 
     titleToken: 'Settings - Labs',
     classNames: ['settings'],

ghost/admin/app/routes/settings/tags/index.js

@@ -1,8 +1,8 @@
 import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default AuthenticatedRoute.extend({
-    mediaQueries: injectService(),
+    mediaQueries: service(),
 
     beforeModel() {
         let firstTag = this.modelFor('settings.tags').get('firstObject');

ghost/admin/app/routes/setup.js

@@ -1,16 +1,16 @@
 import Route from '@ember/routing/route';
 import styleBody from 'ghost-admin/mixins/style-body';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default Route.extend(styleBody, {
     titleToken: 'Setup',
 
     classNames: ['ghost-setup'],
 
-    ghostPaths: injectService(),
+    ghostPaths: service(),
-    session: injectService(),
+    session: service(),
-    ajax: injectService(),
+    ajax: service(),
-    config: injectService(),
+    config: service(),
 
     // use the beforeModel hook to check to see whether or not setup has been
     // previously completed.  If it has, stop the transition into the setup page.

ghost/admin/app/routes/signout.js

@@ -1,7 +1,7 @@
 import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
 import Ember from 'ember';
 import styleBody from 'ghost-admin/mixins/style-body';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 // ember-cli-shims doesn't export canInvoke
 const {canInvoke} = Ember;
@@ -11,7 +11,7 @@ export default AuthenticatedRoute.extend(styleBody, {
 
     classNames: ['ghost-signout'],
 
-    notifications: injectService(),
+    notifications: service(),
 
     afterModel(model, transition) {
         this.get('notifications').clearAll();

ghost/admin/app/routes/signup.js

@@ -4,7 +4,7 @@ import RSVP from 'rsvp';
 import Route from '@ember/routing/route';
 import UnauthenticatedRouteMixin from 'ghost-admin/mixins/unauthenticated-route-mixin';
 import styleBody from 'ghost-admin/mixins/style-body';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 const {Promise} = RSVP;
 const {Errors} = DS;
@@ -12,11 +12,11 @@ const {Errors} = DS;
 export default Route.extend(styleBody, UnauthenticatedRouteMixin, {
     classNames: ['ghost-signup'],
 
-    ghostPaths: injectService(),
+    ghostPaths: service(),
-    notifications: injectService(),
+    notifications: service(),
-    session: injectService(),
+    session: service(),
-    ajax: injectService(),
+    ajax: service(),
-    config: injectService(),
+    config: service(),
 
     beforeModel() {
         if (this.get('session.isAuthenticated')) {

ghost/admin/app/routes/subscribers.js

@@ -1,11 +1,11 @@
 import AuthenticatedRoute from 'ghost-admin/routes/authenticated';
 import RSVP from 'rsvp';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default AuthenticatedRoute.extend({
     titleToken: 'Subscribers',
 
-    feature: injectService(),
+    feature: service(),
 
     // redirect if subscribers is disabled or user isn't owner/admin
     beforeModel() {

ghost/admin/app/services/ajax.js

@@ -3,9 +3,9 @@ import config from 'ghost-admin/config/environment';
 import {AjaxError, isAjaxError} from 'ember-ajax/errors';
 import {computed} from '@ember/object';
 import {get} from '@ember/object';
-import {inject as injectService} from '@ember/service';
 import {isArray as isEmberArray} from '@ember/array';
 import {isNone} from '@ember/utils';
+import {inject as service} from '@ember/service';
 
 const JSONContentType = 'application/json';
 
@@ -113,7 +113,7 @@ export function isThemeValidationError(errorOrStatus, payload) {
 /* end: custom error types */
 
 let ajaxService = AjaxService.extend({
-    session: injectService(),
+    session: service(),
 
     headers: computed('session.isAuthenticated', function () {
         let session = this.get('session');

ghost/admin/app/services/config.js

@@ -1,15 +1,14 @@
 import Ember from 'ember';
-import Service from '@ember/service';
+import Service, {inject as service} from '@ember/service';
 import {assign} from '@ember/polyfills';
 import {computed} from '@ember/object';
-import {inject as injectService} from '@ember/service';
 
 // ember-cli-shims doesn't export _ProxyMixin
 const {_ProxyMixin} = Ember;
 
 export default Service.extend(_ProxyMixin, {
-    ajax: injectService(),
+    ajax: service(),
-    ghostPaths: injectService(),
+    ghostPaths: service(),
 
     content: {},
 

ghost/admin/app/services/feature.js

@@ -1,9 +1,8 @@
 import Ember from 'ember';
 import EmberError from '@ember/error';
 import RSVP from 'rsvp';
-import Service from '@ember/service';
+import Service, {inject as service} from '@ember/service';
 import {computed} from '@ember/object';
-import {inject as injectService} from '@ember/service';
 import {set} from '@ember/object';
 
 export function feature(name, user = false) {
@@ -29,11 +28,11 @@ export function feature(name, user = false) {
 }
 
 export default Service.extend({
-    store: injectService(),
+    store: service(),
-    config: injectService(),
+    config: service(),
-    session: injectService(),
+    session: service(),
-    settings: injectService(),
+    settings: service(),
-    notifications: injectService(),
+    notifications: service(),
 
     publicAPI: feature('publicAPI'),
     subscribers: feature('subscribers'),

ghost/admin/app/services/lazy-loader.js

@@ -1,14 +1,13 @@
 import $ from 'jquery';
 import Ember from 'ember';
 import RSVP from 'rsvp';
-import Service from '@ember/service';
+import Service, {inject as service} from '@ember/service';
-import {inject as injectService} from '@ember/service';
 
 const {testing} = Ember;
 
 export default Service.extend({
-    ajax: injectService(),
+    ajax: service(),
-    ghostPaths: injectService(),
+    ghostPaths: service(),
 
     // This is needed so we can disable it in unit tests
     testing,

ghost/admin/app/services/notifications.js

@@ -1,15 +1,13 @@
-import Service from '@ember/service';
+import Service, {inject as service} from '@ember/service';
 import {dasherize} from '@ember/string';
 import {A as emberA, isArray as isEmberArray} from '@ember/array';
 import {filter} from '@ember/object/computed';
-import {get} from '@ember/object';
+import {get, set} from '@ember/object';
-import {inject as injectService} from '@ember/service';
 import {isBlank} from '@ember/utils';
 import {
     isMaintenanceError,
     isVersionMismatchError
 } from 'ghost-admin/services/ajax';
-import {set} from '@ember/object';
 
 // Notification keys take the form of "noun.verb.message", eg:
 //
@@ -24,7 +22,7 @@ export default Service.extend({
     delayedNotifications: emberA(),
     content: emberA(),
 
-    upgradeStatus: injectService(),
+    upgradeStatus: service(),
 
     alerts: filter('content', function (notification) {
         let status = get(notification, 'status');

ghost/admin/app/services/session.js

@@ -1,12 +1,12 @@
 import RSVP from 'rsvp';
 import SessionService from 'ember-simple-auth/services/session';
 import {computed} from '@ember/object';
-import {inject as injectService} from '@ember/service';
+import {inject as service} from '@ember/service';
 
 export default SessionService.extend({
-    feature: injectService(),
+    feature: service(),
-    store: injectService(),
+    store: service(),
-    tour: injectService(),
+    tour: service(),
 
     user: computed(function () {
         return this.get('store').queryRecord('user', {id: 'me'});

ghost/admin/app/services/settings.js

@@ -1,15 +1,14 @@
 import Ember from 'ember';
 import RSVP from 'rsvp';
-import Service from '@ember/service';
+import Service, {inject as service} from '@ember/service';
 import ValidationEngine from 'ghost-admin/mixins/validation-engine';
 import {get} from '@ember/object';
-import {inject as injectService} from '@ember/service';
 
 // ember-cli-shims doesn't export _ProxyMixin
 const {_ProxyMixin} = Ember;
 
 export default Service.extend(_ProxyMixin, ValidationEngine, {
-    store: injectService(),
+    store: service(),
 
     // will be set to the single Settings model, it's a reference so any later
     // changes to the settings object in the store will be reflected