Add latest changes from gitlab-org/gitlab@master

spec/frontend/monitoring/store/actions_spec.js

 import MockAdapter from 'axios-mock-adapter';
-import Tracking from '~/tracking';
 import testAction from 'helpers/vuex_action_helper';
+import Tracking from '~/tracking';
 import axios from '~/lib/utils/axios_utils';
 import statusCodes from '~/lib/utils/http_status';
 import { backOff } from '~/lib/utils/common_utils';

spec/frontend/mr_popover/mr_popover_spec.js

-import MRPopover from '~/mr_popover/components/mr_popover';
 import { shallowMount } from '@vue/test-utils';
+import MRPopover from '~/mr_popover/components/mr_popover';
 describe('MR Popover', () => {
   let wrapper;

spec/frontend/notes/components/comment_form_spec.js

@@ -2,12 +2,12 @@ import $ from 'jquery';
 import { mount } from '@vue/test-utils';
 import MockAdapter from 'axios-mock-adapter';
 import Autosize from 'autosize';
+import { trimText } from 'helpers/text_helper';
 import axios from '~/lib/utils/axios_utils';
 import createStore from '~/notes/stores';
 import CommentForm from '~/notes/components/comment_form.vue';
 import * as constants from '~/notes/constants';
 import { refreshUserMergeRequestCounts } from '~/commons/nav/user_merge_requests';
-import { trimText } from 'helpers/text_helper';
 import { keyboardDownEvent } from '../../issue_show/helpers';
 import {
   loggedOutnoteableData,

spec/frontend/notes/components/discussion_actions_spec.js

-import createStore from '~/notes/stores';
 import { shallowMount, mount, createLocalVue } from '@vue/test-utils';
 import { discussionMock } from '../../notes/mock_data';
 import DiscussionActions from '~/notes/components/discussion_actions.vue';
@@ -6,6 +5,7 @@ import ReplyPlaceholder from '~/notes/components/discussion_reply_placeholder.vu
 import ResolveDiscussionButton from '~/notes/components/discussion_resolve_button.vue';
 import ResolveWithIssueButton from '~/notes/components/discussion_resolve_with_issue_button.vue';
 import JumpToNextDiscussionButton from '~/notes/components/discussion_jump_to_next_button.vue';
+import createStore from '~/notes/stores';
 // NOTE: clone mock_data so that it is not accidentally mutated
 const createDiscussionMock = (props = {}) =>

spec/frontend/notes/components/discussion_jump_to_next_button_spec.js

-import JumpToNextDiscussionButton from '~/notes/components/discussion_jump_to_next_button.vue';
 import { shallowMount } from '@vue/test-utils';
+import JumpToNextDiscussionButton from '~/notes/components/discussion_jump_to_next_button.vue';
 describe('JumpToNextDiscussionButton', () => {
   let wrapper;

spec/frontend/notes/components/discussion_reply_placeholder_spec.js

-import ReplyPlaceholder from '~/notes/components/discussion_reply_placeholder.vue';
 import { shallowMount, createLocalVue } from '@vue/test-utils';
+import ReplyPlaceholder from '~/notes/components/discussion_reply_placeholder.vue';
 const localVue = createLocalVue();
 const buttonText = 'Test Button Text';

spec/frontend/notes/components/discussion_resolve_button_spec.js

-import resolveDiscussionButton from '~/notes/components/discussion_resolve_button.vue';
 import { createLocalVue, shallowMount } from '@vue/test-utils';
+import resolveDiscussionButton from '~/notes/components/discussion_resolve_button.vue';
 const buttonTitle = 'Resolve discussion';

spec/frontend/notes/old_notes_spec.js

@@ -3,12 +3,12 @@
 import $ from 'jquery';
 import _ from 'underscore';
 import MockAdapter from 'axios-mock-adapter';
-import axios from '~/lib/utils/axios_utils';
-import * as urlUtility from '~/lib/utils/url_utility';
 import '~/behaviors/markdown/render_gfm';
 import { createSpyObj } from 'helpers/jest_helpers';
 import { setTestTimeoutOnce } from 'helpers/timeout';
 import { TEST_HOST } from 'helpers/test_constants';
+import * as urlUtility from '~/lib/utils/url_utility';
+import axios from '~/lib/utils/axios_utils';
 // These must be imported synchronously because they pull dependencies
 // from the DOM.

spec/frontend/operation_settings/components/external_dashboard_spec.js

 import { mount, shallowMount, createLocalVue } from '@vue/test-utils';
 import { GlButton, GlLink, GlFormGroup, GlFormInput } from '@gitlab/ui';
+import { TEST_HOST } from 'helpers/test_constants';
 import ExternalDashboard from '~/operation_settings/components/external_dashboard.vue';
 import store from '~/operation_settings/store';
 import axios from '~/lib/utils/axios_utils';
 import { refreshCurrentPage } from '~/lib/utils/url_utility';
 import createFlash from '~/flash';
-import { TEST_HOST } from 'helpers/test_constants';
 jest.mock('~/lib/utils/url_utility');
 jest.mock('~/flash');

spec/frontend/pages/profiles/show/emoji_menu_spec.js

 import $ from 'jquery';
+import { TEST_HOST } from 'helpers/test_constants';
 import axios from '~/lib/utils/axios_utils';
 import EmojiMenu from '~/pages/profiles/show/emoji_menu';
-import { TEST_HOST } from 'helpers/test_constants';
 describe('EmojiMenu', () => {
   const dummyEmojiTag = '<dummy></tag>';

spec/frontend/performance_bar/components/add_request_spec.js

-import AddRequest from '~/performance_bar/components/add_request.vue';
 import { shallowMount } from '@vue/test-utils';
+import AddRequest from '~/performance_bar/components/add_request.vue';
 describe('add request form', () => {
   let wrapper;

spec/frontend/performance_bar/components/detailed_metric_spec.js

+import { shallowMount } from '@vue/test-utils';
 import DetailedMetric from '~/performance_bar/components/detailed_metric.vue';
 import RequestWarning from '~/performance_bar/components/request_warning.vue';
-import { shallowMount } from '@vue/test-utils';
 describe('detailedMetric', () => {
   const createComponent = props =>

spec/frontend/performance_bar/components/performance_bar_app_spec.js

+import { shallowMount } from '@vue/test-utils';
 import PerformanceBarApp from '~/performance_bar/components/performance_bar_app.vue';
 import PerformanceBarStore from '~/performance_bar/stores/performance_bar_store';
-import { shallowMount } from '@vue/test-utils';
 describe('performance bar app', () => {
   const store = new PerformanceBarStore();

spec/frontend/performance_bar/components/request_selector_spec.js

-import RequestSelector from '~/performance_bar/components/request_selector.vue';
 import { shallowMount } from '@vue/test-utils';
+import RequestSelector from '~/performance_bar/components/request_selector.vue';
 describe('request selector', () => {
   const requests = [

spec/frontend/performance_bar/components/request_warning_spec.js

-import RequestWarning from '~/performance_bar/components/request_warning.vue';
 import { shallowMount } from '@vue/test-utils';
+import RequestWarning from '~/performance_bar/components/request_warning.vue';
 describe('request warning', () => {
   const htmlId = 'request-123';

spec/frontend/pipelines/graph/job_item_spec.js

-import { trimText } from 'helpers/text_helper';
 import { mount } from '@vue/test-utils';
+import { trimText } from 'helpers/text_helper';
 import JobItem from '~/pipelines/components/graph/job_item.vue';
 describe('pipeline graph job item', () => {

spec/frontend/pipelines/test_reports/stores/actions_spec.js

 import MockAdapter from 'axios-mock-adapter';
+import { getJSONFixture } from 'helpers/fixtures';
 import axios from '~/lib/utils/axios_utils';
 import * as actions from '~/pipelines/stores/test_reports/actions';
 import * as types from '~/pipelines/stores/test_reports/mutation_types';
-import { getJSONFixture } from 'helpers/fixtures';
 import { TEST_HOST } from '../../../helpers/test_constants';
 import testAction from '../../../helpers/vuex_action_helper';
 import createFlash from '~/flash';

spec/frontend/pipelines/test_reports/stores/getters_spec.js

+import { getJSONFixture } from 'helpers/fixtures';
 import * as getters from '~/pipelines/stores/test_reports/getters';
 import { iconForTestStatus } from '~/pipelines/stores/test_reports/utils';
-import { getJSONFixture } from 'helpers/fixtures';
 describe('Getters TestReports Store', () => {
   let state;

spec/frontend/pipelines/test_reports/stores/mutations_spec.js

+import { getJSONFixture } from 'helpers/fixtures';
 import * as types from '~/pipelines/stores/test_reports/mutation_types';
 import mutations from '~/pipelines/stores/test_reports/mutations';
-import { getJSONFixture } from 'helpers/fixtures';
 describe('Mutations TestReports Store', () => {
   let mockState;

spec/frontend/pipelines/test_reports/test_reports_spec.js

 import Vuex from 'vuex';
-import TestReports from '~/pipelines/components/test_reports/test_reports.vue';
 import { shallowMount } from '@vue/test-utils';
-import * as actions from '~/pipelines/stores/test_reports/actions';
 import { getJSONFixture } from 'helpers/fixtures';
+import TestReports from '~/pipelines/components/test_reports/test_reports.vue';
+import * as actions from '~/pipelines/stores/test_reports/actions';
 describe('Test reports app', () => {
   let wrapper;