Merge branch 'fix-sec-master-merge' into 'master'

Fix merge conflict on security master

See merge request gitlab-org/security/gitlab!1224

.gitlab/merge_request_templates/Documentation.md

@@ -31,13 +31,13 @@ When applicable:
 
 - [ ] Update the [permissions table](https://docs.gitlab.com/ee/user/permissions.html).
 - [ ] Link docs to and from the higher-level index page, plus other related docs where helpful.
-- [ ] Add the [product tier badge](https://docs.gitlab.com/ee/development/documentation/styleguide.html#product-badges) accordingly.
-- [ ] Add [GitLab's version history note(s)](https://docs.gitlab.com/ee/development/documentation/styleguide.html#text-for-documentation-requiring-version-text).
+- [ ] Add the [product tier badge](https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#product-tier-badges) accordingly.
+- [ ] Add [GitLab's version history note(s)](https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#gitlab-versions).
 - [ ] Add/update the [feature flag section](https://docs.gitlab.com/ee/development/documentation/feature_flags.html).
 
 ## Review checklist
 
-All reviewers can help ensure accuracy, clarity, completeness, and adherence to the [Documentation Guidelines](https://docs.gitlab.com/ee/development/documentation/) and [Style Guide](https://docs.gitlab.com/ee/development/documentation/styleguide.html).
+All reviewers can help ensure accuracy, clarity, completeness, and adherence to the [Documentation Guidelines](https://docs.gitlab.com/ee/development/documentation/) and [Style Guide](https://docs.gitlab.com/ee/development/documentation/styleguide/).
 
 **1. Primary Reviewer**
 

app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue

@@ -4,8 +4,8 @@ import { GlModal, GlTabs, GlTab, GlSearchBoxByType, GlSprintf } from '@gitlab/ui
 import { BV_SHOW_MODAL } from '~/lib/utils/constants';
 import ReviewTabContainer from '~/add_context_commits_modal/components/review_tab_container.vue';
 import { s__ } from '~/locale';
-import eventHub from '../event_hub';
 import { deprecatedCreateFlash as createFlash } from '~/flash';
+import eventHub from '../event_hub';
 import {
   findCommitIndex,
   setCommitStatus,

app/assets/javascripts/alert_management/components/alert_details.vue

@@ -13,22 +13,22 @@ import {
 } from '@gitlab/ui';
 import * as Sentry from '~/sentry/wrapper';
 import { s__ } from '~/locale';
-import alertQuery from '../graphql/queries/details.query.graphql';
-import sidebarStatusQuery from '../graphql/queries/sidebar_status.query.graphql';
 import { fetchPolicies } from '~/lib/graphql';
 import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
 import highlightCurrentUser from '~/behaviors/markdown/highlight_current_user';
 import initUserPopovers from '~/user_popovers';
-import { ALERTS_SEVERITY_LABELS, trackAlertsDetailsViewsOptions } from '../constants';
-import createIssueMutation from '../graphql/mutations/create_issue_from_alert.mutation.graphql';
-import toggleSidebarStatusMutation from '../graphql/mutations/toggle_sidebar_status.mutation.graphql';
 import { visitUrl, joinPaths } from '~/lib/utils/url_utility';
 import Tracking from '~/tracking';
 import { toggleContainerClasses } from '~/lib/utils/dom_utils';
+import AlertDetailsTable from '~/vue_shared/components/alert_details_table.vue';
+import alertQuery from '../graphql/queries/details.query.graphql';
+import sidebarStatusQuery from '../graphql/queries/sidebar_status.query.graphql';
+import { ALERTS_SEVERITY_LABELS, trackAlertsDetailsViewsOptions } from '../constants';
+import createIssueMutation from '../graphql/mutations/create_issue_from_alert.mutation.graphql';
+import toggleSidebarStatusMutation from '../graphql/mutations/toggle_sidebar_status.mutation.graphql';
 import SystemNote from './system_notes/system_note.vue';
 import AlertSidebar from './alert_sidebar.vue';
 import AlertMetrics from './alert_metrics.vue';
-import AlertDetailsTable from '~/vue_shared/components/alert_details_table.vue';
 import AlertSummaryRow from './alert_summary_row.vue';
 
 const containerEl = document.querySelector('.page-with-contextual-sidebar');

app/assets/javascripts/alert_management/components/alert_sidebar.vue

 <script>
+import sidebarStatusQuery from '../graphql/queries/sidebar_status.query.graphql';
 import SidebarHeader from './sidebar/sidebar_header.vue';
 import SidebarTodo from './sidebar/sidebar_todo.vue';
 import SidebarStatus from './sidebar/sidebar_status.vue';
 import SidebarAssignees from './sidebar/sidebar_assignees.vue';
 
-import sidebarStatusQuery from '../graphql/queries/sidebar_status.query.graphql';
-
 export default {
   components: {
     SidebarAssignees,

app/assets/javascripts/alert_management/components/alert_status.vue

@@ -2,8 +2,8 @@
 import { GlDropdown, GlDropdownItem } from '@gitlab/ui';
 import { s__ } from '~/locale';
 import Tracking from '~/tracking';
-import { trackAlertStatusUpdateOptions } from '../constants';
 import updateAlertStatusMutation from '~/graphql_shared/mutations/update_alert_status.mutation.graphql';
+import { trackAlertStatusUpdateOptions } from '../constants';
 
 export default {
   i18n: {

app/assets/javascripts/alert_management/components/sidebar/sidebar_todo.vue

@@ -2,8 +2,8 @@
 import produce from 'immer';
 import { s__ } from '~/locale';
 import Todo from '~/sidebar/components/todo_toggle/todo.vue';
-import createAlertTodoMutation from '../../graphql/mutations/alert_todo_create.mutation.graphql';
 import todoMarkDoneMutation from '~/graphql_shared/mutations/todo_mark_done.mutation.graphql';
+import createAlertTodoMutation from '../../graphql/mutations/alert_todo_create.mutation.graphql';
 import alertQuery from '../../graphql/queries/details.query.graphql';
 
 export default {

app/assets/javascripts/alerts_settings/components/alert_mapping_builder.vue

@@ -12,13 +12,13 @@ import { s__, __ } from '~/locale';
 // Mocks will be removed when integrating with BE is ready
 // data format is defined and will be the same as mocked (maybe with some minor changes)
 // feature rollout plan - https://gitlab.com/gitlab-org/gitlab/-/issues/262707#note_442529171
-import gitlabFieldsMock from './mocks/gitlabFields.json';
 import { capitalizeFirstCharacter } from '~/lib/utils/text_utility';
 import {
   getMappingData,
   getPayloadFields,
   transformForSave,
 } from '../utils/mapping_transformations';
+import gitlabFieldsMock from './mocks/gitlabFields.json';
 
 export const i18n = {
   columns: {

app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue

@@ -15,8 +15,6 @@ import {
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { s__ } from '~/locale';
 import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
-import MappingBuilder from './alert_mapping_builder.vue';
-import AlertSettingsFormHelpBlock from './alert_settings_form_help_block.vue';
 import getCurrentIntegrationQuery from '../graphql/queries/get_current_integration.query.graphql';
 import {
   integrationTypes,
@@ -24,6 +22,8 @@ import {
   targetPrometheusUrlPlaceholder,
   typeSet,
 } from '../constants';
+import MappingBuilder from './alert_mapping_builder.vue';
+import AlertSettingsFormHelpBlock from './alert_settings_form_help_block.vue';
 // Mocks will be removed when integrating with BE is ready
 // data format is defined and will be the same as mocked (maybe with some minor changes)
 // feature rollout plan - https://gitlab.com/gitlab-org/gitlab/-/issues/262707#note_442529171

app/assets/javascripts/alerts_settings/components/alerts_settings_wrapper.vue

@@ -12,8 +12,6 @@ import destroyHttpIntegrationMutation from '../graphql/mutations/destroy_http_in
 import resetHttpTokenMutation from '../graphql/mutations/reset_http_token.mutation.graphql';
 import resetPrometheusTokenMutation from '../graphql/mutations/reset_prometheus_token.mutation.graphql';
 import updateCurrentIntergrationMutation from '../graphql/mutations/update_current_intergration.mutation.graphql';
-import IntegrationsList from './alerts_integrations_list.vue';
-import AlertSettingsForm from './alerts_settings_form.vue';
 import service from '../services';
 import { typeSet } from '../constants';
 import {
@@ -27,6 +25,8 @@ import {
   UPDATE_INTEGRATION_ERROR,
   INTEGRATION_PAYLOAD_TEST_ERROR,
 } from '../utils/error_messages';
+import AlertSettingsForm from './alerts_settings_form.vue';
+import IntegrationsList from './alerts_integrations_list.vue';
 
 export default {
   typeSet,

app/assets/javascripts/analytics/instance_statistics/components/app.vue

 <script>
+import { TODAY, TOTAL_DAYS_TO_SHOW, START_DATE } from '../constants';
 import InstanceCounts from './instance_counts.vue';
 import InstanceStatisticsCountChart from './instance_statistics_count_chart.vue';
 import UsersChart from './users_chart.vue';
 import ProjectsAndGroupsChart from './projects_and_groups_chart.vue';
 import ChartsConfig from './charts_config';
-import { TODAY, TOTAL_DAYS_TO_SHOW, START_DATE } from '../constants';
 
 export default {
   name: 'InstanceStatisticsApp',

app/assets/javascripts/api.js

-import axios from './lib/utils/axios_utils';
-import { joinPaths } from './lib/utils/url_utility';
 import { deprecatedCreateFlash as flash } from '~/flash';
 import { __ } from '~/locale';
+import axios from './lib/utils/axios_utils';
+import { joinPaths } from './lib/utils/url_utility';
 
 const DEFAULT_PER_PAGE = 20;
 

app/assets/javascripts/api/user_api.js

+import { deprecatedCreateFlash as flash } from '~/flash';
+import { __ } from '~/locale';
 import axios from '../lib/utils/axios_utils';
 import { buildApiUrl } from './api_utils';
 import { DEFAULT_PER_PAGE } from './constants';
-import { deprecatedCreateFlash as flash } from '~/flash';
-import { __ } from '~/locale';
 
 const USER_COUNTS_PATH = '/api/:version/user_counts';
 const USERS_PATH = '/api/:version/users.json';

app/assets/javascripts/awards_handler.js

@@ -4,12 +4,12 @@ import $ from 'jquery';
 import { uniq } from 'lodash';
 import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils';
 import Cookies from 'js-cookie';
+import * as Emoji from '~/emoji';
+import { dispose, fixTitle } from '~/tooltips';
 import { __ } from './locale';
 import { isInVueNoteablePage } from './lib/utils/dom_utils';
 import { deprecatedCreateFlash as flash } from './flash';
 import axios from './lib/utils/axios_utils';
-import * as Emoji from '~/emoji';
-import { dispose, fixTitle } from '~/tooltips';
 
 const animationEndEventString = 'animationend webkitAnimationEnd MSAnimationEnd oAnimationEnd';
 const transitionEndEventString = 'transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd';

app/assets/javascripts/badges/components/badge_list.vue

 <script>
 import { mapState } from 'vuex';
 import { GlLoadingIcon } from '@gitlab/ui';
-import BadgeListRow from './badge_list_row.vue';
 import { GROUP_BADGE } from '../constants';
+import BadgeListRow from './badge_list_row.vue';
 
 export default {
   name: 'BadgeList',

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

 import axios from '~/lib/utils/axios_utils';
-import types from './mutation_types';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
+import types from './mutation_types';
 
 export const transformBackendBadge = (badge) => ({
   ...convertObjectPropsToCamelCase(badge, true),

app/assets/javascripts/badges/store/mutations.js

-import types from './mutation_types';
 import { PROJECT_BADGE } from '../constants';
+import types from './mutation_types';
 
 const reorderBadges = (badges) =>
   badges.sort((a, b) => {

app/assets/javascripts/batch_comments/components/draft_note.vue

@@ -3,8 +3,8 @@
 import { mapActions, mapGetters, mapState } from 'vuex';
 import { GlButton } from '@gitlab/ui';
 import NoteableNote from '~/notes/components/noteable_note.vue';
-import PublishButton from './publish_button.vue';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
+import PublishButton from './publish_button.vue';
 
 export default {
   components: {

app/assets/javascripts/batch_comments/components/preview_item.vue

@@ -3,13 +3,13 @@ import { mapGetters } from 'vuex';
 import { GlSprintf, GlIcon } from '@gitlab/ui';
 import { IMAGE_DIFF_POSITION_TYPE } from '~/diffs/constants';
 import { sprintf, __ } from '~/locale';
-import resolvedStatusMixin from '../mixins/resolved_status';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import {
   getStartLineNumber,
   getEndLineNumber,
   getLineClasses,
 } from '~/notes/components/multiline_comment_utils';
+import resolvedStatusMixin from '../mixins/resolved_status';
 
 export default {
   components: {

app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js

@@ -2,8 +2,8 @@ import { deprecatedCreateFlash as flash } from '~/flash';
 import { __ } from '~/locale';
 import { scrollToElement } from '~/lib/utils/common_utils';
 import service from '../../../services/drafts_service';
-import * as types from './mutation_types';
 import { CHANGES_TAB, DISCUSSION_TAB, SHOW_TAB } from '../../../constants';
+import * as types from './mutation_types';
 
 export const saveDraft = ({ dispatch }, draft) =>
   dispatch('saveNote', { ...draft, isDraft: true }, { root: true });

app/assets/javascripts/behaviors/markdown/nodes/table_header_row.js

 /* eslint-disable class-methods-use-this */
 
-import TableRow from './table_row';
 import { HIGHER_PARSE_RULE_PRIORITY } from '../constants';
+import TableRow from './table_row';
 
 const CENTER_ALIGN = 'center';
 

app/assets/javascripts/behaviors/markdown/render_gfm.js

 import $ from 'jquery';
 import syntaxHighlight from '~/syntax_highlight';
+import initUserPopovers from '../../user_popovers';
 import renderMath from './render_math';
 import renderMermaid from './render_mermaid';
 import renderMetrics from './render_metrics';
 import highlightCurrentUser from './highlight_current_user';
-import initUserPopovers from '../../user_popovers';
 
 // Render GitLab flavoured Markdown
 //

app/assets/javascripts/behaviors/quick_submit.js

 import $ from 'jquery';
 import '../commons/bootstrap';
-import { isInIssuePage } from '../lib/utils/common_utils';
 import { __ } from '~/locale';
 import { add, show, hide } from '~/tooltips';
+import { isInIssuePage } from '../lib/utils/common_utils';
 
 // Quick Submit behavior
 //

app/assets/javascripts/behaviors/shortcuts/shortcuts.js

@@ -3,12 +3,12 @@ import Cookies from 'js-cookie';
 import Mousetrap from 'mousetrap';
 import Vue from 'vue';
 import { flatten } from 'lodash';
-import { disableShortcuts, shouldDisableShortcuts } from './shortcuts_toggle';
-import ShortcutsToggle from './shortcuts_toggle.vue';
+import { parseBoolean, getCspNonceValue } from '~/lib/utils/common_utils';
 import axios from '../../lib/utils/axios_utils';
 import { refreshCurrentPage, visitUrl } from '../../lib/utils/url_utility';
 import findAndFollowLink from '../../lib/utils/navigation_utility';
-import { parseBoolean, getCspNonceValue } from '~/lib/utils/common_utils';
+import { disableShortcuts, shouldDisableShortcuts } from './shortcuts_toggle';
+import ShortcutsToggle from './shortcuts_toggle.vue';
 import { keysFor, TOGGLE_PERFORMANCE_BAR, TOGGLE_CANARY } from './keybindings';
 
 const defaultStopCallback = Mousetrap.prototype.stopCallback;

app/assets/javascripts/behaviors/shortcuts/shortcuts_issuable.js

 import $ from 'jquery';
 import Mousetrap from 'mousetrap';
-import Sidebar from '../../right_sidebar';
-import Shortcuts from './shortcuts';
-import { CopyAsGFM } from '../markdown/copy_as_gfm';
 import { getSelectedFragment } from '~/lib/utils/common_utils';
 import { isElementVisible } from '~/lib/utils/dom_utils';
 import { clickCopyToClipboardButton } from '~/behaviors/copy_to_clipboard';
+import { CopyAsGFM } from '../markdown/copy_as_gfm';
+import Sidebar from '../../right_sidebar';
+import Shortcuts from './shortcuts';
 
 export default class ShortcutsIssuable extends Shortcuts {
   constructor() {

app/assets/javascripts/behaviors/shortcuts/shortcuts_wiki.js

 import Mousetrap from 'mousetrap';
-import ShortcutsNavigation from './shortcuts_navigation';
 import findAndFollowLink from '../../lib/utils/navigation_utility';
+import ShortcutsNavigation from './shortcuts_navigation';
 
 export default class ShortcutsWiki extends ShortcutsNavigation {
   constructor() {

app/assets/javascripts/blob/balsamiq_viewer.js

+import { __ } from '~/locale';
 import { deprecatedCreateFlash as Flash } from '../flash';
 import BalsamiqViewer from './balsamiq/balsamiq_viewer';
-import { __ } from '~/locale';
 
 function onError() {
   const flash = new Flash(__('Balsamiq file could not be loaded.'));

app/assets/javascripts/blob/blob_file_dropzone.js

@@ -2,10 +2,10 @@
 
 import $ from 'jquery';
 import Dropzone from 'dropzone';
+import { sprintf, __ } from '~/locale';
 import { visitUrl } from '../lib/utils/url_utility';
 import { HIDDEN_CLASS } from '../lib/utils/constants';
 import csrf from '../lib/utils/csrf';
-import { sprintf, __ } from '~/locale';
 
 Dropzone.autoDiscover = false;
 

app/assets/javascripts/blob/template_selectors/ci_syntax_yaml_selector.js

-import FileTemplateSelector from '../file_template_selector';
 import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown';
+import FileTemplateSelector from '../file_template_selector';
 
 export default class BlobCiSyntaxYamlSelector extends FileTemplateSelector {
   constructor({ mediator }) {

app/assets/javascripts/blob/template_selectors/ci_yaml_selector.js

-import FileTemplateSelector from '../file_template_selector';
 import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown';
+import FileTemplateSelector from '../file_template_selector';
 
 export default class BlobCiYamlSelector extends FileTemplateSelector {
   constructor({ mediator }) {

app/assets/javascripts/blob/template_selectors/dockerfile_selector.js

-import FileTemplateSelector from '../file_template_selector';
 import { __ } from '~/locale';
 import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown';
+import FileTemplateSelector from '../file_template_selector';
 
 export default class DockerfileSelector extends FileTemplateSelector {
   constructor({ mediator }) {

app/assets/javascripts/blob/template_selectors/gitignore_selector.js

-import FileTemplateSelector from '../file_template_selector';
 import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown';
+import FileTemplateSelector from '../file_template_selector';
 
 export default class BlobGitignoreSelector extends FileTemplateSelector {
   constructor({ mediator }) {

app/assets/javascripts/blob/template_selectors/license_selector.js

-import FileTemplateSelector from '../file_template_selector';
 import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown';
+import FileTemplateSelector from '../file_template_selector';
 
 export default class BlobLicenseSelector extends FileTemplateSelector {
   constructor({ mediator }) {

app/assets/javascripts/blob/template_selectors/metrics_dashboard_selector.js

-import FileTemplateSelector from '../file_template_selector';
 import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown';
+import FileTemplateSelector from '../file_template_selector';
 
 export default class MetricsDashboardSelector extends FileTemplateSelector {
   constructor({ mediator }) {

app/assets/javascripts/blob/template_selectors/type_selector.js

-import FileTemplateSelector from '../file_template_selector';
 import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown';
+import FileTemplateSelector from '../file_template_selector';
 
 export default class FileTemplateTypeSelector extends FileTemplateSelector {
   constructor({ mediator, dropdownData }) {

app/assets/javascripts/blob/viewer/index.js

 import $ from 'jquery';
 import '~/behaviors/markdown/render_gfm';
+import { __ } from '~/locale';
+import { fixTitle } from '~/tooltips';
 import { deprecatedCreateFlash as Flash } from '../../flash';
 import { handleLocationHash } from '../../lib/utils/common_utils';
 import axios from '../../lib/utils/axios_utils';
 import eventHub from '../../notes/event_hub';
-import { __ } from '~/locale';
-import { fixTitle } from '~/tooltips';
 
 const loadRichBlobViewer = (type) => {
   switch (type) {

app/assets/javascripts/blob_edit/blob_bundle.js

 /* eslint-disable no-new */
 
 import $ from 'jquery';
-import NewCommitForm from '../new_commit_form';
 import { deprecatedCreateFlash as createFlash } from '~/flash';
-import BlobFileDropzone from '../blob/blob_file_dropzone';
 import initPopover from '~/blob/suggest_gitlab_ci_yml';
 import { disableButtonIfEmptyField, setCookie } from '~/lib/utils/common_utils';
 import Tracking from '~/tracking';
+import BlobFileDropzone from '../blob/blob_file_dropzone';
+import NewCommitForm from '../new_commit_form';
 
 const initPopovers = () => {
   const suggestEl = document.querySelector('.js-suggest-gitlab-ci-yml');

app/assets/javascripts/blob_edit/edit_blob.js

 import $ from 'jquery';
 import axios from '~/lib/utils/axios_utils';
 import { deprecatedCreateFlash as createFlash } from '~/flash';
-import { BLOB_EDITOR_ERROR, BLOB_PREVIEW_ERROR } from './constants';
-import TemplateSelectorMediator from '../blob/file_template_mediator';
 import { addEditorMarkdownListeners } from '~/lib/utils/text_markdown';
 import EditorLite from '~/editor/editor_lite';
 import { FileTemplateExtension } from '~/editor/extensions/editor_file_template_ext';
 import { insertFinalNewline } from '~/lib/utils/text_utility';
+import TemplateSelectorMediator from '../blob/file_template_mediator';
+import { BLOB_EDITOR_ERROR, BLOB_PREVIEW_ERROR } from './constants';
 
 export default class EditBlob {
   // The options object has:

app/assets/javascripts/boards/boards_util.js

 import { sortBy } from 'lodash';
-import { ListType } from './constants';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
+import { ListType } from './constants';
 
 export function getMilestone() {
   return null;

app/assets/javascripts/boards/components/board_card.vue

 <script>
-import BoardCardLayout from './board_card_layout.vue';
-import BoardCardLayoutDeprecated from './board_card_layout_deprecated.vue';
-import eventHub from '../eventhub';
 import sidebarEventHub from '~/sidebar/event_hub';
+import eventHub from '../eventhub';
 import boardsStore from '../stores/boards_store';
+import BoardCardLayout from './board_card_layout.vue';
+import BoardCardLayoutDeprecated from './board_card_layout_deprecated.vue';
 
 export default {
   name: 'BoardsIssueCard',

app/assets/javascripts/boards/components/board_card_layout.vue

 <script>
 import { mapActions, mapGetters, mapState } from 'vuex';
-import IssueCardInner from './issue_card_inner.vue';
 import { ISSUABLE } from '~/boards/constants';
+import IssueCardInner from './issue_card_inner.vue';
 
 export default {
   name: 'BoardCardLayout',

app/assets/javascripts/boards/components/board_card_layout_deprecated.vue

 <script>
 import { mapActions, mapGetters } from 'vuex';
-import IssueCardInner from './issue_card_inner.vue';
-import IssueCardInnerDeprecated from './issue_card_inner_deprecated.vue';
-import boardsStore from '../stores/boards_store';
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { ISSUABLE } from '~/boards/constants';
+import boardsStore from '../stores/boards_store';
+import IssueCardInner from './issue_card_inner.vue';
+import IssueCardInnerDeprecated from './issue_card_inner_deprecated.vue';
 
 export default {
   name: 'BoardCardLayout',

app/assets/javascripts/boards/components/board_column.vue

 <script>
 import { mapGetters, mapActions, mapState } from 'vuex';
 import BoardListHeader from 'ee_else_ce/boards/components/board_list_header.vue';
-import BoardList from './board_list.vue';
 import { isListDraggable } from '../boards_util';
+import BoardList from './board_list.vue';
 
 export default {
   components: {

app/assets/javascripts/boards/components/board_column_deprecated.vue

@@ -2,9 +2,9 @@
 // This component is being replaced in favor of './board_column.vue' for GraphQL boards
 import Sortable from 'sortablejs';
 import BoardListHeader from 'ee_else_ce/boards/components/board_list_header_deprecated.vue';
-import BoardList from './board_list_deprecated.vue';
 import boardsStore from '../stores/boards_store';
 import { getBoardSortableDefaultOptions, sortableEnd } from '../mixins/sortable_default_options';
+import BoardList from './board_list_deprecated.vue';
 
 export default {
   components: {

app/assets/javascripts/boards/components/board_content.vue

@@ -3,11 +3,11 @@ import Draggable from 'vuedraggable';
 import { mapState, mapGetters, mapActions } from 'vuex';
 import { sortBy } from 'lodash';
 import { GlAlert } from '@gitlab/ui';
-import BoardColumnDeprecated from './board_column_deprecated.vue';
-import BoardColumn from './board_column.vue';
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import defaultSortableConfig from '~/sortable/sortable_config';
 import { sortableEnd, sortableStart } from '~/boards/mixins/sortable_default_options';
+import BoardColumn from './board_column.vue';
+import BoardColumnDeprecated from './board_column_deprecated.vue';
 
 export default {
   components: {

app/assets/javascripts/boards/components/board_form.vue

@@ -8,10 +8,10 @@ import { convertToGraphQLId } from '~/graphql_shared/utils';
 import boardsStore from '~/boards/stores/boards_store';
 import { fullLabelId, fullBoardId } from '../boards_util';
 
-import BoardConfigurationOptions from './board_configuration_options.vue';
 import updateBoardMutation from '../graphql/board_update.mutation.graphql';
 import createBoardMutation from '../graphql/board_create.mutation.graphql';
 import destroyBoardMutation from '../graphql/board_destroy.mutation.graphql';
+import BoardConfigurationOptions from './board_configuration_options.vue';
 
 const boardDefaults = {
   id: false,

app/assets/javascripts/boards/components/board_list.vue

@@ -4,10 +4,10 @@ import { mapActions, mapState } from 'vuex';
 import { GlLoadingIcon } from '@gitlab/ui';
 import defaultSortableConfig from '~/sortable/sortable_config';
 import { sortableStart, sortableEnd } from '~/boards/mixins/sortable_default_options';
+import { sprintf, __ } from '~/locale';
+import eventHub from '../eventhub';
 import BoardNewIssue from './board_new_issue.vue';
 import BoardCard from './board_card.vue';
-import eventHub from '../eventhub';
-import { sprintf, __ } from '~/locale';
 
 export default {
   name: 'BoardList',

app/assets/javascripts/boards/components/board_list_deprecated.vue

 <script>
 import { Sortable, MultiDrag } from 'sortablejs';
 import { GlLoadingIcon } from '@gitlab/ui';
-import boardNewIssue from './board_new_issue_deprecated.vue';
-import boardCard from './board_card.vue';
-import eventHub from '../eventhub';
-import boardsStore from '../stores/boards_store';
 import { sprintf, __ } from '~/locale';
 import { deprecatedCreateFlash as createFlash } from '~/flash';
+import eventHub from '../eventhub';
+import boardsStore from '../stores/boards_store';
 import {
   getBoardSortableDefaultOptions,
   sortableStart,
   sortableEnd,
 } from '../mixins/sortable_default_options';
+import boardCard from './board_card.vue';
+import boardNewIssue from './board_new_issue_deprecated.vue';
 
 // This component is being replaced in favor of './board_list.vue' for GraphQL boards
 

app/assets/javascripts/boards/components/board_list_header.vue

@@ -10,13 +10,13 @@ import {
   GlTooltipDirective,
 } from '@gitlab/ui';
 import { n__, s__, __ } from '~/locale';
-import AccessorUtilities from '../../lib/utils/accessor';
-import IssueCount from './issue_count.vue';
-import eventHub from '../eventhub';
 import sidebarEventHub from '~/sidebar/event_hub';
-import { inactiveId, LIST, ListType } from '../constants';
 import { isScopedLabel } from '~/lib/utils/common_utils';
 import { isListDraggable } from '~/boards/boards_util';
+import { inactiveId, LIST, ListType } from '../constants';
+import eventHub from '../eventhub';
+import AccessorUtilities from '../../lib/utils/accessor';
+import IssueCount from './issue_count.vue';
 
 export default {
   i18n: {

app/assets/javascripts/boards/components/board_list_header_deprecated.vue

@@ -10,13 +10,13 @@ import {
   GlTooltipDirective,
 } from '@gitlab/ui';
 import { n__, s__ } from '~/locale';
+import sidebarEventHub from '~/sidebar/event_hub';
+import { isScopedLabel } from '~/lib/utils/common_utils';
 import AccessorUtilities from '../../lib/utils/accessor';
-import IssueCount from './issue_count.vue';
 import boardsStore from '../stores/boards_store';
 import eventHub from '../eventhub';
-import sidebarEventHub from '~/sidebar/event_hub';
 import { inactiveId, LIST, ListType } from '../constants';
-import { isScopedLabel } from '~/lib/utils/common_utils';
+import IssueCount from './issue_count.vue';
 
 // This component is being replaced in favor of './board_list_header.vue' for GraphQL boards
 

app/assets/javascripts/boards/components/board_new_issue.vue

@@ -2,10 +2,10 @@
 import { mapActions, mapState } from 'vuex';
 import { GlButton } from '@gitlab/ui';
 import { getMilestone } from 'ee_else_ce/boards/boards_util';
-import eventHub from '../eventhub';
-import ProjectSelect from './project_select.vue';
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { __ } from '~/locale';
+import eventHub from '../eventhub';
+import ProjectSelect from './project_select.vue';
 
 export default {
   name: 'BoardNewIssue',

app/assets/javascripts/boards/components/board_new_issue_deprecated.vue

@@ -2,10 +2,10 @@
 import { GlButton } from '@gitlab/ui';
 import { getMilestone } from 'ee_else_ce/boards/boards_util';
 import ListIssue from 'ee_else_ce/boards/models/issue';
+import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import eventHub from '../eventhub';
-import ProjectSelect from './project_select_deprecated.vue';
 import boardsStore from '../stores/boards_store';
-import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
+import ProjectSelect from './project_select_deprecated.vue';
 
 // This component is being replaced in favor of './board_new_issue.vue' for GraphQL boards
 

app/assets/javascripts/boards/components/board_sidebar.js

@@ -18,9 +18,9 @@ import Assignees from '~/sidebar/components/assignees/assignees.vue';
 import Subscriptions from '~/sidebar/components/subscriptions/subscriptions.vue';
 import TimeTracker from '~/sidebar/components/time_tracking/time_tracker.vue';
 import MilestoneSelect from '~/milestone_select';
-import RemoveBtn from './sidebar/remove_issue.vue';
-import boardsStore from '../stores/boards_store';
 import { isScopedLabel } from '~/lib/utils/common_utils';
+import boardsStore from '../stores/boards_store';
+import RemoveBtn from './sidebar/remove_issue.vue';
 
 export default Vue.extend({
   components: {

app/assets/javascripts/boards/components/issue_card_inner.vue

@@ -5,13 +5,13 @@ import { GlLabel, GlTooltipDirective, GlIcon } from '@gitlab/ui';
 import issueCardInner from 'ee_else_ce/boards/mixins/issue_card_inner';
 import { sprintf, __, n__ } from '~/locale';
 import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue';
+import { isScopedLabel } from '~/lib/utils/common_utils';
+import { updateHistory } from '~/lib/utils/url_utility';
 import UserAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue';
-import IssueDueDate from './issue_due_date.vue';
-import IssueTimeEstimate from './issue_time_estimate.vue';
 import eventHub from '../eventhub';
-import { isScopedLabel } from '~/lib/utils/common_utils';
 import { ListType } from '../constants';
-import { updateHistory } from '~/lib/utils/url_utility';
+import IssueDueDate from './issue_due_date.vue';
+import IssueTimeEstimate from './issue_time_estimate.vue';
 
 export default {
   components: {

app/assets/javascripts/boards/components/issue_card_inner_deprecated.vue

@@ -5,11 +5,11 @@ import { GlLabel, GlTooltipDirective, GlIcon } from '@gitlab/ui';
 import issueCardInner from 'ee_else_ce/boards/mixins/issue_card_inner';
 import { sprintf, __, n__ } from '~/locale';
 import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue';
+import { isScopedLabel } from '~/lib/utils/common_utils';
 import UserAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue';
+import boardsStore from '../stores/boards_store';
 import IssueDueDate from './issue_due_date.vue';
 import IssueTimeEstimate from './issue_time_estimate_deprecated.vue';
-import boardsStore from '../stores/boards_store';
-import { isScopedLabel } from '~/lib/utils/common_utils';
 
 export default {
   components: {

app/assets/javascripts/boards/components/modal/footer.vue

@@ -3,10 +3,10 @@ import { GlButton } from '@gitlab/ui';
 import footerEEMixin from 'ee_else_ce/boards/mixins/modal_footer';
 import { deprecatedCreateFlash as Flash } from '../../../flash';
 import { __, n__ } from '../../../locale';
-import ListsDropdown from './lists_dropdown.vue';
 import ModalStore from '../../stores/modal_store';
 import modalMixin from '../../mixins/modal_mixins';
 import boardsStore from '../../stores/boards_store';
+import ListsDropdown from './lists_dropdown.vue';
 
 export default {
   components: {

app/assets/javascripts/boards/components/modal/header.vue

@@ -2,10 +2,10 @@
 /* eslint-disable @gitlab/vue-require-i18n-strings */
 import { GlButton } from '@gitlab/ui';
 import { __ } from '~/locale';
-import ModalFilters from './filters';
-import ModalTabs from './tabs.vue';
 import ModalStore from '../../stores/modal_store';
 import modalMixin from '../../mixins/modal_mixins';
+import ModalFilters from './filters';
+import ModalTabs from './tabs.vue';
 
 export default {
   components: {

app/assets/javascripts/boards/components/modal/index.vue

@@ -3,11 +3,11 @@
 import { GlLoadingIcon } from '@gitlab/ui';
 import { urlParamsToObject } from '~/lib/utils/common_utils';
 import boardsStore from '~/boards/stores/boards_store';
+import ModalStore from '../../stores/modal_store';
 import ModalHeader from './header.vue';
 import ModalList from './list.vue';
 import ModalFooter from './footer.vue';
 import EmptyState from './empty_state.vue';
-import ModalStore from '../../stores/modal_store';
 
 export default {
   components: {

app/assets/javascripts/boards/components/new_list_dropdown.js

@@ -4,12 +4,12 @@ import $ from 'jquery';
 import { __ } from '~/locale';
 import axios from '~/lib/utils/axios_utils';
 import { deprecatedCreateFlash as flash } from '~/flash';
-import CreateLabelDropdown from '../../create_label';
-import boardsStore from '../stores/boards_store';
-import { fullLabelId } from '../boards_util';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import store from '~/boards/stores';
 import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown';
+import CreateLabelDropdown from '../../create_label';
+import boardsStore from '../stores/boards_store';
+import { fullLabelId } from '../boards_util';
 
 function shouldCreateListGraphQL(label) {
   return store.getters.shouldUseGraphQL && !store.getters.getListByLabelId(fullLabelId(label));

app/assets/javascripts/boards/components/project_select_deprecated.vue

@@ -6,10 +6,10 @@ import {
   GlSearchBoxByType,
   GlLoadingIcon,
 } from '@gitlab/ui';
-import eventHub from '../eventhub';
 import { s__ } from '~/locale';
-import Api from '../../api';
 import { featureAccessLevel } from '~/pages/projects/shared/permissions/constants';
+import eventHub from '../eventhub';
+import Api from '../../api';
 import { ListType } from '../constants';
 
 export default {

app/assets/javascripts/boards/components/sidebar/board_sidebar_milestone_select.vue

@@ -9,9 +9,9 @@ import {
   GlLoadingIcon,
 } from '@gitlab/ui';
 import BoardEditableItem from '~/boards/components/sidebar/board_editable_item.vue';
-import projectMilestones from '../../graphql/project_milestones.query.graphql';
 import createFlash from '~/flash';
 import { __, s__ } from '~/locale';
+import projectMilestones from '../../graphql/project_milestones.query.graphql';
 
 export default {
   components: {

app/assets/javascripts/boards/filtered_search_boards.js

 import IssuableFilteredSearchTokenKeys from 'ee_else_ce/filtered_search/issuable_filtered_search_token_keys';
 import FilteredSearchManager from 'ee_else_ce/filtered_search/filtered_search_manager';
 import { transformBoardConfig } from 'ee_else_ce/boards/boards_util';
+import { updateHistory } from '~/lib/utils/url_utility';
 import FilteredSearchContainer from '../filtered_search/container';
 import boardsStore from './stores/boards_store';
 import vuexstore from './stores';
-import { updateHistory } from '~/lib/utils/url_utility';
 
 export default class FilteredSearchBoards extends FilteredSearchManager {
   constructor(store, updateUrl = false, cantEdit = []) {

app/assets/javascripts/boards/index.js

@@ -3,6 +3,7 @@ import { mapActions, mapGetters } from 'vuex';
 
 import 'ee_else_ce/boards/models/issue';
 import 'ee_else_ce/boards/models/list';
+import VueApollo from 'vue-apollo';
 import BoardSidebar from 'ee_else_ce/boards/components/board_sidebar';
 import initNewListDropdown from 'ee_else_ce/boards/components/new_list_dropdown';
 import boardConfigToggle from 'ee_else_ce/boards/config_toggle';
@@ -15,7 +16,6 @@ import {
   getBoardsModalData,
 } from 'ee_else_ce/boards/ee_functions';
 
-import VueApollo from 'vue-apollo';
 import BoardContent from '~/boards/components/board_content.vue';
 import BoardExtraActions from '~/boards/components/board_extra_actions.vue';
 import createDefaultClient from '~/lib/graphql';

app/assets/javascripts/boards/models/issue.js

@@ -6,8 +6,8 @@
 import axios from '~/lib/utils/axios_utils';
 import './label';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
-import IssueProject from './project';
 import boardsStore from '../stores/boards_store';
+import IssueProject from './project';
 
 class ListIssue {
   constructor(obj) {

app/assets/javascripts/boards/models/list.js

 /* eslint-disable class-methods-use-this */
 import { __ } from '~/locale';
-import ListLabel from './label';
-import ListAssignee from './assignee';
 import { deprecatedCreateFlash as flash } from '~/flash';
 import boardsStore from '../stores/boards_store';
+import ListLabel from './label';
+import ListAssignee from './assignee';
 import ListMilestone from './milestone';
 import 'ee_else_ce/boards/models/issue';
 

app/assets/javascripts/boards/stores/actions.js

@@ -5,7 +5,9 @@ import createGqClient, { fetchPolicies } from '~/lib/graphql';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import { convertObjectPropsToCamelCase, urlParamsToObject } from '~/lib/utils/common_utils';
 import { BoardType, ListType, inactiveId } from '~/boards/constants';
-import * as types from './mutation_types';
+import createFlash from '~/flash';
+import { __ } from '~/locale';
+import updateAssigneesMutation from '~/vue_shared/components/sidebar/queries/updateAssignees.mutation.graphql';
 import {
   formatBoardLists,
   formatListIssues,
@@ -15,9 +17,6 @@ import {
   formatIssueInput,
   updateListPosition,
 } from '../boards_util';
-import createFlash from '~/flash';
-import { __ } from '~/locale';
-import updateAssigneesMutation from '~/vue_shared/components/sidebar/queries/updateAssignees.mutation.graphql';
 import listsIssuesQuery from '../graphql/lists_issues.query.graphql';
 import boardLabelsQuery from '../graphql/board_labels.query.graphql';
 import createBoardListMutation from '../graphql/board_list_create.mutation.graphql';
@@ -31,6 +30,7 @@ import issueSetSubscriptionMutation from '../graphql/issue_set_subscription.muta
 import issueSetMilestoneMutation from '../graphql/issue_set_milestone.mutation.graphql';
 import issueSetTitleMutation from '../graphql/issue_set_title.mutation.graphql';
 import groupProjectsQuery from '../graphql/group_projects.query.graphql';
+import * as types from './mutation_types';
 
 const notImplemented = () => {
   /* eslint-disable-next-line @gitlab/require-i18n-strings */

app/assets/javascripts/boards/stores/mutations.js

 import Vue from 'vue';
 import { pull, union } from 'lodash';
-import { formatIssue, moveIssueListHelper } from '../boards_util';
-import * as mutationTypes from './mutation_types';
 import { s__ } from '~/locale';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
+import { formatIssue, moveIssueListHelper } from '../boards_util';
+import * as mutationTypes from './mutation_types';
 
 const notImplemented = () => {
   /* eslint-disable-next-line @gitlab/require-i18n-strings */

app/assets/javascripts/branches/components/divergence_graph.vue

 <script>
 import { sprintf, __ } from '~/locale';
-import GraphBar from './graph_bar.vue';
 import { MAX_COMMIT_COUNT } from '../constants';
+import GraphBar from './graph_bar.vue';
 
 export default {
   components: {

app/assets/javascripts/build_artifacts.js

 /* eslint-disable func-names */
 
 import $ from 'jquery';
+import { hide, initTooltips, show } from '~/tooltips';
 import { visitUrl } from './lib/utils/url_utility';
 import { parseBoolean } from './lib/utils/common_utils';
-import { hide, initTooltips, show } from '~/tooltips';
 
 export default class BuildArtifacts {
   constructor() {

app/assets/javascripts/ci_settings_pipeline_triggers/index.js

 import Vue from 'vue';
-import TriggersList from './components/triggers_list.vue';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
+import TriggersList from './components/triggers_list.vue';
 
 const parseJsonArray = (triggers) => {
   try {

app/assets/javascripts/ci_variable_list/index.js

 import Vue from 'vue';
+import { parseBoolean } from '~/lib/utils/common_utils';
 import CiVariableSettings from './components/ci_variable_settings.vue';
 import createStore from './store';
-import { parseBoolean } from '~/lib/utils/common_utils';
 
 export default (containerId = 'js-ci-project-variables') => {
   const containerEl = document.getElementById(containerId);

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

-import * as types from './mutation_types';
 import axios from '~/lib/utils/axios_utils';
 import Api from '~/api';
 import { deprecatedCreateFlash as createFlash } from '~/flash';
 import { __ } from '~/locale';
+import * as types from './mutation_types';
 import { prepareDataForApi, prepareDataForDisplay, prepareEnvironments } from './utils';
 
 export const toggleValues = ({ commit }, valueState) => {

app/assets/javascripts/ci_variable_list/store/mutations.js

-import * as types from './mutation_types';
 import { displayText } from '../constants';
+import * as types from './mutation_types';
 
 export default {
   [types.REQUEST_VARIABLES](state) {

app/assets/javascripts/clusters/clusters_bundle.js

@@ -2,6 +2,8 @@ import Visibility from 'visibilityjs';
 import Vue from 'vue';
 import { GlToast } from '@gitlab/ui';
 import AccessorUtilities from '~/lib/utils/accessor';
+import initProjectSelectDropdown from '~/project_select';
+import initServerlessSurveyBanner from '~/serverless/survey_banner';
 import PersistentUserCallout from '../persistent_user_callout';
 import { s__, sprintf } from '../locale';
 import { deprecatedCreateFlash as Flash } from '../flash';
@@ -13,8 +15,6 @@ import ClustersService from './services/clusters_service';
 import ClustersStore from './stores/clusters_store';
 import Applications from './components/applications.vue';
 import RemoveClusterConfirmation from './components/remove_cluster_confirmation.vue';
-import initProjectSelectDropdown from '~/project_select';
-import initServerlessSurveyBanner from '~/serverless/survey_banner';
 
 const Environments = () => import('ee_component/clusters/components/environments.vue');
 

app/assets/javascripts/clusters/components/application_row.vue

@@ -3,12 +3,11 @@ import { GlLink, GlModalDirective, GlSprintf, GlButton, GlAlert } from '@gitlab/
 import { s__, __, sprintf } from '~/locale';
 import eventHub from '../event_hub';
 import identicon from '../../vue_shared/components/identicon.vue';
+import { APPLICATION_STATUS, ELASTIC_STACK } from '../constants';
 import UninstallApplicationButton from './uninstall_application_button.vue';
 import UninstallApplicationConfirmationModal from './uninstall_application_confirmation_modal.vue';
 import UpdateApplicationConfirmationModal from './update_application_confirmation_modal.vue';
 
-import { APPLICATION_STATUS, ELASTIC_STACK } from '../constants';
-
 export default {
   components: {
     GlButton,

app/assets/javascripts/clusters/components/applications.vue

@@ -10,11 +10,11 @@ import knativeLogo from 'images/cluster_app_logos/knative.png';
 import prometheusLogo from 'images/cluster_app_logos/prometheus.png';
 import elasticStackLogo from 'images/cluster_app_logos/elastic_stack.png';
 import fluentdLogo from 'images/cluster_app_logos/fluentd.png';
-import applicationRow from './application_row.vue';
+import eventHub from '~/clusters/event_hub';
 import clipboardButton from '../../vue_shared/components/clipboard_button.vue';
-import KnativeDomainEditor from './knative_domain_editor.vue';
 import { CLUSTER_TYPE, PROVIDER_TYPE, APPLICATION_STATUS, INGRESS } from '../constants';
-import eventHub from '~/clusters/event_hub';
+import applicationRow from './application_row.vue';
+import KnativeDomainEditor from './knative_domain_editor.vue';
 import CrossplaneProviderStack from './crossplane_provider_stack.vue';
 import IngressModsecuritySettings from './ingress_modsecurity_settings.vue';
 import FluentdOutputSettings from './fluentd_output_settings.vue';

app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue

@@ -11,9 +11,9 @@ import {
   GlIcon,
 } from '@gitlab/ui';
 import modSecurityLogo from 'images/cluster_app_logos/gitlab.png';
-import { s__, __ } from '../../locale';
 import { APPLICATION_STATUS, INGRESS, LOGGING_MODE, BLOCKING_MODE } from '~/clusters/constants';
 import eventHub from '~/clusters/event_hub';
+import { s__, __ } from '../../locale';
 
 const { UPDATING, UNINSTALLING, INSTALLING, INSTALLED, UPDATED } = APPLICATION_STATUS;
 

app/assets/javascripts/clusters/components/knative_domain_editor.vue

@@ -9,10 +9,10 @@ import {
   GlButton,
   GlAlert,
 } from '@gitlab/ui';
-import ClipboardButton from '../../vue_shared/components/clipboard_button.vue';
 import { __, s__ } from '~/locale';
 
 import { APPLICATION_STATUS } from '~/clusters/constants';
+import ClipboardButton from '../../vue_shared/components/clipboard_button.vue';
 
 const { UPDATING, UNINSTALLING } = APPLICATION_STATUS;
 

app/assets/javascripts/clusters_list/components/clusters.vue

@@ -10,10 +10,10 @@ import {
   GlTable,
   GlTooltipDirective,
 } from '@gitlab/ui';
+import { __, sprintf } from '~/locale';
+import { CLUSTER_TYPES, STATUSES } from '../constants';
 import AncestorNotice from './ancestor_notice.vue';
 import NodeErrorHelpText from './node_error_help_text.vue';
-import { CLUSTER_TYPES, STATUSES } from '../constants';
-import { __, sprintf } from '~/locale';
 
 export default {
   nodeMemoryText: __('%{totalMemory} (%{freeSpacePercentage}%{percentSymbol} free)'),

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

@@ -3,8 +3,8 @@ import Poll from '~/lib/utils/poll';
 import axios from '~/lib/utils/axios_utils';
 import { deprecatedCreateFlash as flash } from '~/flash';
 import { __ } from '~/locale';
-import { MAX_REQUESTS } from '../constants';
 import { parseIntPagination, normalizeHeaders } from '~/lib/utils/common_utils';
+import { MAX_REQUESTS } from '../constants';
 import * as types from './mutation_types';
 
 const allNodesPresent = (clusters, retryCount) => {

app/assets/javascripts/code_navigation/components/app.vue

 <script>
 import { mapActions, mapState } from 'vuex';
-import Popover from './popover.vue';
 import eventHub from '../../notes/event_hub';
+import Popover from './popover.vue';
 
 export default {
   components: {

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

 import axios from '~/lib/utils/axios_utils';
-import * as types from './mutation_types';
 import { getCurrentHoverElement, setCurrentHoverElement, addInteractionClass } from '../utils';
+import * as types from './mutation_types';
 
 export default {
   setInitialData({ commit }, data) {

app/assets/javascripts/compare_autocomplete.js

 /* eslint-disable func-names */
 
 import $ from 'jquery';
+import { fixTitle } from '~/tooltips';
+import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown';
 import { __ } from './locale';
 import axios from './lib/utils/axios_utils';
 import { deprecatedCreateFlash as flash } from './flash';
 import { capitalizeFirstCharacter } from './lib/utils/text_utility';
-import { fixTitle } from '~/tooltips';
-import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown';
 
 export default function initCompareAutocomplete(limitTo = null, clickHandler = () => {}) {
   $('.js-compare-dropdown').each(function () {

app/assets/javascripts/contributors/components/contributors.vue

@@ -6,8 +6,8 @@ import { GlAreaChart } from '@gitlab/ui/dist/charts';
 import { __ } from '~/locale';
 import { getSvgIconPathContent } from '~/lib/utils/icon_utils';
 import { getDatesInRange } from '~/lib/utils/datetime_utility';
-import { xAxisLabelFormatter, dateFormatter } from '../utils';
 import ResizableChartContainer from '~/vue_shared/components/resizable_chart/resizable_chart_container.vue';
+import { xAxisLabelFormatter, dateFormatter } from '../utils';
 
 export default {
   components: {

app/assets/javascripts/create_cluster/eks_cluster/components/service_credentials_form.vue

@@ -3,9 +3,9 @@
 import { GlButton, GlFormGroup, GlFormInput, GlIcon, GlLink, GlSprintf, GlAlert } from '@gitlab/ui';
 import { escape } from 'lodash';
 import { mapState, mapActions } from 'vuex';
-import { DEFAULT_REGION } from '../constants';
 import { sprintf, s__, __ } from '~/locale';
 import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
+import { DEFAULT_REGION } from '../constants';
 
 export default {
   components: {

app/assets/javascripts/create_cluster/eks_cluster/store/actions.js

-import * as types from './mutation_types';
-import { DEFAULT_REGION } from '../constants';
-import { setAWSConfig } from '../services/aws_services_facade';
 import axios from '~/lib/utils/axios_utils';
 import { deprecatedCreateFlash as createFlash } from '~/flash';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
+import { setAWSConfig } from '../services/aws_services_facade';
+import { DEFAULT_REGION } from '../constants';
+import * as types from './mutation_types';
 
 const getErrorMessage = (data) => {
   const errorKey = Object.keys(data)[0];

app/assets/javascripts/create_cluster/eks_cluster/store/index.js

 import Vuex from 'vuex';
-import * as actions from './actions';
-import * as getters from './getters';
-import mutations from './mutations';
-import state from './state';
-
 import clusterDropdownStore from '~/create_cluster/store/cluster_dropdown';
-
 import {
   fetchRoles,
   fetchKeyPairs,
@@ -13,6 +7,10 @@ import {
   fetchSubnets,
   fetchSecurityGroups,
 } from '../services/aws_services_facade';
+import * as actions from './actions';
+import * as getters from './getters';
+import mutations from './mutations';
+import state from './state';
 
 const createStore = ({ initialState }) =>
   new Vuex.Store({

app/assets/javascripts/create_cluster/gke_cluster/store/actions.js

-import * as types from './mutation_types';
 import gapiLoader from '../gapi_loader';
+import * as types from './mutation_types';
 
 const gapiResourceListRequest = ({ resource, params, commit, mutation, payloadKey }) =>
   new Promise((resolve, reject) => {

app/assets/javascripts/create_cluster/init_create_cluster.js

+import PersistentUserCallout from '~/persistent_user_callout';
 import initGkeDropdowns from './gke_cluster';
 import initGkeNamespace from './gke_cluster_namespace';
-import PersistentUserCallout from '~/persistent_user_callout';
 
 const newClusterViews = [':clusters:new', ':clusters:create_gcp', ':clusters:create_user'];
 

app/assets/javascripts/custom_metrics/components/custom_metrics_form.vue

@@ -2,9 +2,9 @@
 import { GlButton } from '@gitlab/ui';
 import { __, s__ } from '~/locale';
 import csrf from '~/lib/utils/csrf';
+import { formDataValidator } from '../constants';
 import CustomMetricsFormFields from './custom_metrics_form_fields.vue';
 import DeleteCustomMetricModal from './delete_custom_metric_modal.vue';
-import { formDataValidator } from '../constants';
 
 export default {
   components: {

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

 <script>
 /* eslint-disable vue/no-v-html */
-import iconCycleAnalyticsSplash from 'icons/_icon_cycle_analytics_splash.svg';
 import { GlIcon } from '@gitlab/ui';
+import iconCycleAnalyticsSplash from 'icons/_icon_cycle_analytics_splash.svg';
 
 export default {
   components: {

app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js

@@ -6,8 +6,8 @@ import $ from 'jquery';
 import Vue from 'vue';
 import Cookies from 'js-cookie';
 import { GlEmptyState, GlLoadingIcon } from '@gitlab/ui';
-import { deprecatedCreateFlash as Flash } from '../flash';
 import { __ } from '~/locale';
+import { deprecatedCreateFlash as Flash } from '../flash';
 import Translate from '../vue_shared/translate';
 import banner from './components/banner.vue';
 import stageCodeComponent from './components/stage_code_component.vue';

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

-import * as types from './mutation_types';
 import Api from '~/api';
 import { deprecatedCreateFlash as createFlash } from '~/flash';
 import { __ } from '~/locale';
+import * as types from './mutation_types';
 
 export const requestAddFreezePeriod = ({ commit }) => {
   commit(types.REQUEST_ADD_FREEZE_PERIOD);

app/assets/javascripts/design_management/components/design_notes/design_discussion.vue

@@ -9,12 +9,12 @@ import allVersionsMixin from '../../mixins/all_versions';
 import createNoteMutation from '../../graphql/mutations/create_note.mutation.graphql';
 import toggleResolveDiscussionMutation from '../../graphql/mutations/toggle_resolve_discussion.mutation.graphql';
 import activeDiscussionQuery from '../../graphql/queries/active_discussion.query.graphql';
-import DesignNote from './design_note.vue';
-import DesignReplyForm from './design_reply_form.vue';
 import { ACTIVE_DISCUSSION_SOURCE_TYPES } from '../../constants';
-import ToggleRepliesWidget from './toggle_replies_widget.vue';
 import { hasErrors } from '../../utils/cache_update';
 import { ADD_DISCUSSION_COMMENT_ERROR } from '../../utils/error_messages';
+import DesignNote from './design_note.vue';
+import DesignReplyForm from './design_reply_form.vue';
+import ToggleRepliesWidget from './toggle_replies_widget.vue';
 
 export default {
   components: {

app/assets/javascripts/design_management/components/design_notes/design_note.vue

 <script>
 import { ApolloMutation } from 'vue-apollo';
 import { GlTooltipDirective, GlIcon, GlLink, GlSafeHtmlDirective } from '@gitlab/ui';
-import updateNoteMutation from '../../graphql/mutations/update_note.mutation.graphql';
 import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
 import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue';
 import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
-import DesignReplyForm from './design_reply_form.vue';
+import updateNoteMutation from '../../graphql/mutations/update_note.mutation.graphql';
 import { findNoteId, extractDesignNoteId } from '../../utils/design_management_utils';
 import { hasErrors } from '../../utils/cache_update';
+import DesignReplyForm from './design_reply_form.vue';
 
 export default {
   components: {

app/assets/javascripts/design_management/components/design_overlay.vue

@@ -2,8 +2,8 @@
 import { __ } from '~/locale';
 import activeDiscussionQuery from '../graphql/queries/active_discussion.query.graphql';
 import updateActiveDiscussionMutation from '../graphql/mutations/update_active_discussion.mutation.graphql';
-import DesignNotePin from './design_note_pin.vue';
 import { ACTIVE_DISCUSSION_SOURCE_TYPES } from '../constants';
+import DesignNotePin from './design_note_pin.vue';
 
 export default {
   name: 'DesignOverlay',

app/assets/javascripts/design_management/components/design_sidebar.vue

@@ -3,13 +3,13 @@ import Cookies from 'js-cookie';
 import { GlCollapse, GlButton, GlPopover } from '@gitlab/ui';
 import { s__ } from '~/locale';
 import { parseBoolean } from '~/lib/utils/common_utils';
+import Participants from '~/sidebar/components/participants/participants.vue';
+import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import updateActiveDiscussionMutation from '../graphql/mutations/update_active_discussion.mutation.graphql';
 import { extractDiscussions, extractParticipants } from '../utils/design_management_utils';
 import { ACTIVE_DISCUSSION_SOURCE_TYPES } from '../constants';
 import DesignDiscussion from './design_notes/design_discussion.vue';
-import Participants from '~/sidebar/components/participants/participants.vue';
 import DesignTodoButton from './design_todo_button.vue';
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 
 export default {
   components: {

app/assets/javascripts/design_management/components/design_todo_button.vue

 <script>
 import todoMarkDoneMutation from '~/graphql_shared/mutations/todo_mark_done.mutation.graphql';
+import TodoButton from '~/vue_shared/components/todo_button.vue';
 import getDesignQuery from '../graphql/queries/get_design.query.graphql';
 import createDesignTodoMutation from '../graphql/mutations/create_design_todo.mutation.graphql';
-import TodoButton from '~/vue_shared/components/todo_button.vue';
 import allVersionsMixin from '../mixins/all_versions';
 import { updateStoreAfterDeleteDesignTodo } from '../utils/cache_update';
 import { findIssueId, findDesignId } from '../utils/design_management_utils';

app/assets/javascripts/design_management/components/toolbar/index.vue

@@ -3,9 +3,9 @@ import { GlButton, GlIcon, GlTooltipDirective } from '@gitlab/ui';
 import permissionsQuery from 'shared_queries/design_management/design_permissions.query.graphql';
 import { __, sprintf } from '~/locale';
 import timeagoMixin from '~/vue_shared/mixins/timeago';
-import DesignNavigation from './design_navigation.vue';
 import DeleteButton from '../delete_button.vue';
 import { DESIGNS_ROUTE_NAME } from '../../router/constants';
+import DesignNavigation from './design_navigation.vue';
 
 export default {
   components: {

app/assets/javascripts/design_management/mixins/all_designs.js

@@ -2,8 +2,8 @@ import { propertyOf } from 'lodash';
 import getDesignListQuery from 'shared_queries/design_management/get_design_list.query.graphql';
 import createFlash, { FLASH_TYPES } from '~/flash';
 import { s__ } from '~/locale';
-import allVersionsMixin from './all_versions';
 import { DESIGNS_ROUTE_NAME } from '../router/constants';
+import allVersionsMixin from './all_versions';
 
 export default {
   mixins: [allVersionsMixin],

app/assets/javascripts/design_management/pages/index.vue

@@ -6,12 +6,12 @@ import permissionsQuery from 'shared_queries/design_management/design_permission
 import createFlash, { FLASH_TYPES } from '~/flash';
 import { __, s__, sprintf } from '~/locale';
 import { getFilename } from '~/lib/utils/file_upload';
+import DesignDropzone from '~/vue_shared/components/upload_dropzone/upload_dropzone.vue';
 import UploadButton from '../components/upload/button.vue';
 import DeleteButton from '../components/delete_button.vue';
 import Design from '../components/list/item.vue';
 import DesignDestroyer from '../components/design_destroyer.vue';
 import DesignVersionDropdown from '../components/upload/design_version_dropdown.vue';
-import DesignDropzone from '~/vue_shared/components/upload_dropzone/upload_dropzone.vue';
 import uploadDesignMutation from '../graphql/mutations/upload_design.mutation.graphql';
 import moveDesignMutation from '../graphql/mutations/move_design.mutation.graphql';
 import allDesignsMixin from '../mixins/all_designs';