Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/create_cluster/gke_cluster/components/gke_dropdown_mixin.js

 import _ from 'underscore';
+import { GlLoadingIcon } from '@gitlab/ui';
 import DropdownSearchInput from '~/vue_shared/components/dropdown/dropdown_search_input.vue';
 import DropdownHiddenInput from '~/vue_shared/components/dropdown/dropdown_hidden_input.vue';
 import DropdownButton from '~/vue_shared/components/dropdown/dropdown_button.vue';
-import { GlLoadingIcon } from '@gitlab/ui';
 import store from '../store';

app/assets/javascripts/create_cluster/gke_cluster/components/gke_machine_type_dropdown.vue

 <script>
-import { sprintf, s__ } from '~/locale';
 import { mapState, mapGetters, mapActions } from 'vuex';
+import { sprintf, s__ } from '~/locale';
 import gkeDropdownMixin from './gke_dropdown_mixin';

app/assets/javascripts/create_cluster/gke_cluster/components/gke_project_id_dropdown.vue

 <script>
 import _ from 'underscore';
-import { s__, sprintf } from '~/locale';
 import { mapState, mapGetters, mapActions } from 'vuex';
+import { s__, sprintf } from '~/locale';
 import gkeDropdownMixin from './gke_dropdown_mixin';

app/assets/javascripts/create_cluster/gke_cluster/components/gke_zone_dropdown.vue

 <script>
-import { sprintf, s__ } from '~/locale';
 import { mapState, mapActions } from 'vuex';
+import { sprintf, s__ } from '~/locale';
 import gkeDropdownMixin from './gke_dropdown_mixin';

app/assets/javascripts/cycle_analytics/components/banner.vue

 <script>
-import Icon from '~/vue_shared/components/icon.vue';
 import iconCycleAnalyticsSplash from 'icons/_icon_cycle_analytics_splash.svg';
+import Icon from '~/vue_shared/components/icon.vue';
 export default {
   components: {

app/assets/javascripts/deploy_keys/components/app.vue

 <script>
+import { GlLoadingIcon } from '@gitlab/ui';
 import { s__ } from '~/locale';
 import Flash from '~/flash';
 import NavigationTabs from '~/vue_shared/components/navigation_tabs.vue';
@@ -6,7 +7,6 @@ import eventHub from '../eventhub';
 import DeployKeysService from '../service';
 import DeployKeysStore from '../store';
 import KeysPanel from './keys_panel.vue';
-import { GlLoadingIcon } from '@gitlab/ui';
 export default {
   components: {

app/assets/javascripts/diffs/components/app.vue

 <script>
 import { mapState, mapGetters, mapActions } from 'vuex';
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
+import { GlLoadingIcon } from '@gitlab/ui';
+import Mousetrap from 'mousetrap';
 import Icon from '~/vue_shared/components/icon.vue';
 import { __ } from '~/locale';
 import createFlash from '~/flash';
-import { GlLoadingIcon } from '@gitlab/ui';
 import PanelResizer from '~/vue_shared/components/panel_resizer.vue';
-import Mousetrap from 'mousetrap';
+import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import eventHub from '../../notes/event_hub';
 import CompareVersions from './compare_versions.vue';
 import DiffFile from './diff_file.vue';

app/assets/javascripts/diffs/components/diff_expansion_cell.vue

 <script>
+import { mapState, mapActions } from 'vuex';
 import createFlash from '~/flash';
 import { s__ } from '~/locale';
-import { mapState, mapActions } from 'vuex';
 import Icon from '~/vue_shared/components/icon.vue';
 import { UNFOLD_COUNT } from '../constants';
 import * as utils from '../store/utils';

app/assets/javascripts/diffs/components/diff_file.vue

 <script>
 import { mapActions, mapGetters, mapState } from 'vuex';
 import _ from 'underscore';
+import { GlLoadingIcon } from '@gitlab/ui';
 import { __, sprintf } from '~/locale';
 import createFlash from '~/flash';
-import { GlLoadingIcon } from '@gitlab/ui';
 import eventHub from '../../notes/event_hub';
 import DiffFileHeader from './diff_file_header.vue';
 import DiffContent from './diff_content.vue';

app/assets/javascripts/diffs/components/diff_file_header.vue

 <script>
 import _ from 'underscore';
 import { mapActions, mapGetters } from 'vuex';
+import { GlButton, GlTooltipDirective, GlTooltip, GlLoadingIcon } from '@gitlab/ui';
 import { polyfillSticky, stickyMonitor } from '~/lib/utils/sticky';
 import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
 import Icon from '~/vue_shared/components/icon.vue';
 import FileIcon from '~/vue_shared/components/file_icon.vue';
-import { GlButton, GlTooltipDirective, GlTooltip, GlLoadingIcon } from '@gitlab/ui';
 import { truncateSha } from '~/lib/utils/text_utility';
 import { __, s__, sprintf } from '~/locale';
 import { diffViewerModes } from '~/ide/constants';

app/assets/javascripts/diffs/components/diff_gutter_avatars.vue

 <script>
+import { GlTooltipDirective } from '@gitlab/ui';
 import { n__ } from '~/locale';
 import Icon from '~/vue_shared/components/icon.vue';
 import { truncate } from '~/lib/utils/text_utility';
 import UserAvatarImage from '~/vue_shared/components/user_avatar/user_avatar_image.vue';
-import { GlTooltipDirective } from '@gitlab/ui';
 import { COUNT_OF_AVATARS_IN_GUTTER, LENGTH_OF_AVATAR_TOOLTIP } from '../constants';
 export default {

app/assets/javascripts/diffs/components/diff_line_note_form.vue

 <script>
 import { mapState, mapGetters, mapActions } from 'vuex';
-import { s__ } from '~/locale';
 import diffLineNoteFormMixin from 'ee_else_ce/notes/mixins/diff_line_note_form';
+import { s__ } from '~/locale';
 import noteForm from '../../notes/components/note_form.vue';
 import autosave from '../../notes/mixins/autosave';
 import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue';

app/assets/javascripts/diffs/store/actions.js

 import Vue from 'vue';
-import axios from '~/lib/utils/axios_utils';
 import Cookies from 'js-cookie';
+import axios from '~/lib/utils/axios_utils';
 import createFlash from '~/flash';
 import { s__ } from '~/locale';
 import { handleLocationHash, historyPushState, scrollToElement } from '~/lib/utils/common_utils';

app/assets/javascripts/emoji/no_emoji_validator.js

-import { __ } from '~/locale';
 import emojiRegex from 'emoji-regex';
+import { __ } from '~/locale';
 import InputValidator from '../validators/input_validator';
 export default class NoEmojiValidator extends InputValidator {

app/assets/javascripts/environments/components/container.vue

 <script>
 import { GlLoadingIcon } from '@gitlab/ui';
-import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue';
 import containerMixin from 'ee_else_ce/environments/mixins/container_mixin';
+import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue';
 import EnvironmentTable from '../components/environments_table.vue';
 export default {

app/assets/javascripts/environments/components/environment_actions.vue

 <script>
+import { GlLoadingIcon } from '@gitlab/ui';
 import { __, s__, sprintf } from '~/locale';
 import { formatTime } from '~/lib/utils/datetime_utility';
 import Icon from '~/vue_shared/components/icon.vue';
 import eventHub from '../event_hub';
 import tooltip from '../../vue_shared/directives/tooltip';
-import { GlLoadingIcon } from '@gitlab/ui';
 export default {
   directives: {

app/assets/javascripts/environments/components/environment_item.vue

 <script>
 /* eslint-disable @gitlab/vue-i18n/no-bare-strings */
-import { __, sprintf } from '~/locale';
 import { format } from 'timeago.js';
 import _ from 'underscore';
 import { GlTooltipDirective } from '@gitlab/ui';
+import environmentItemMixin from 'ee_else_ce/environments/mixins/environment_item_mixin';
 import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
 import Icon from '~/vue_shared/components/icon.vue';
 import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue';
-import environmentItemMixin from 'ee_else_ce/environments/mixins/environment_item_mixin';
+import { __, sprintf } from '~/locale';
 import ActionsComponent from './environment_actions.vue';
 import ExternalUrlComponent from './environment_external_url.vue';
 import StopComponent from './environment_stop.vue';

app/assets/javascripts/environments/components/environment_monitoring.vue

 <script>
+import { GlButton, GlTooltipDirective } from '@gitlab/ui';
 import { __ } from '~/locale';
 /**
  * Renders the Monitoring (Metrics) link in environments table.
  */
-import { GlButton, GlTooltipDirective } from '@gitlab/ui';
 import Icon from '~/vue_shared/components/icon.vue';
 export default {

app/assets/javascripts/environments/components/environments_table.vue

@@ -4,8 +4,8 @@
  */
 import { GlLoadingIcon } from '@gitlab/ui';
 import _ from 'underscore';
-import { s__ } from '~/locale';
 import environmentTableMixin from 'ee_else_ce/environments/mixins/environments_table_mixin';
+import { s__ } from '~/locale';
 import EnvironmentItem from './environment_item.vue';
 export default {

app/assets/javascripts/environments/stores/environments_store.js

-import { parseIntPagination, normalizeHeaders } from '~/lib/utils/common_utils';
 import { setDeployBoard } from 'ee_else_ce/environments/stores/helpers';
+import { parseIntPagination, normalizeHeaders } from '~/lib/utils/common_utils';
 /**
  * Environments Store.