Add latest changes from gitlab-org/gitlab@master

3 files changed, 9 insertions, 10 deletions

diff --git a/spec/frontend/pipeline_editor/components/commit/commit_section_spec.js b/spec/frontend/pipeline_editor/components/commit/commit_section_spec.js
index a480af3ea5b..269c0cb525e 100644
--- a/spec/frontend/pipeline_editor/components/commit/commit_section_spec.js
+++ b/spec/frontend/pipeline_editor/components/commit/commit_section_spec.js
@@ -5,6 +5,7 @@ import CommitForm from '~/pipeline_editor/components/commit/commit_form.vue';
 import { objectToQuery, redirectTo } from '~/lib/utils/url_utility';
 import commitCreate from '~/pipeline_editor/graphql/mutations/commit_ci_file.mutation.graphql';
 
+import { COMMIT_SUCCESS } from '~/pipeline_editor/constants';
 import {
   mockCiConfigPath,
   mockCiYml,
@@ -15,7 +16,6 @@ import {
   mockProjectFullPath,
   mockNewMergeRequestPath,
 } from '../../mock_data';
-import { COMMIT_SUCCESS } from '~/pipeline_editor/constants';
 
 jest.mock('~/lib/utils/url_utility', () => ({
   redirectTo: jest.fn(),
diff --git a/spec/frontend/pipeline_editor/components/text_editor_spec.js b/spec/frontend/pipeline_editor/components/text_editor_spec.js
index 86ee370bb72..9bb4bb6c210 100644
--- a/spec/frontend/pipeline_editor/components/text_editor_spec.js
+++ b/spec/frontend/pipeline_editor/components/text_editor_spec.js
@@ -1,5 +1,7 @@
 import { shallowMount } from '@vue/test-utils';
 
+import { EDITOR_READY_EVENT } from '~/editor/constants';
+import TextEditor from '~/pipeline_editor/components/text_editor.vue';
 import {
   mockCiConfigPath,
   mockCiYml,
@@ -8,9 +10,6 @@ import {
   mockProjectNamespace,
 } from '../mock_data';
 
-import { EDITOR_READY_EVENT } from '~/editor/constants';
-import TextEditor from '~/pipeline_editor/components/text_editor.vue';
-
 describe('Pipeline Editor | Text editor component', () => {
   let wrapper;
 
diff --git a/spec/frontend/pipeline_editor/pipeline_editor_app_spec.js b/spec/frontend/pipeline_editor/pipeline_editor_app_spec.js
index d9e7c708396..7ffdf1815ba 100644
--- a/spec/frontend/pipeline_editor/pipeline_editor_app_spec.js
+++ b/spec/frontend/pipeline_editor/pipeline_editor_app_spec.js
@@ -6,6 +6,12 @@ import createMockApollo from 'helpers/mock_apollo_helper';
 import TextEditor from '~/pipeline_editor/components/text_editor.vue';
 
 import httpStatusCodes from '~/lib/utils/http_status';
+
+import { COMMIT_SUCCESS, COMMIT_FAILURE, LOAD_FAILURE_UNKNOWN } from '~/pipeline_editor/constants';
+import CommitForm from '~/pipeline_editor/components/commit/commit_form.vue';
+import getCiConfigData from '~/pipeline_editor/graphql/queries/ci_config.graphql';
+import PipelineEditorApp from '~/pipeline_editor/pipeline_editor_app.vue';
+import PipelineEditorHome from '~/pipeline_editor/pipeline_editor_home.vue';
 import {
   mockCiConfigPath,
   mockCiConfigQueryResponse,
@@ -14,12 +20,6 @@ import {
   mockProjectFullPath,
 } from './mock_data';
 
-import { COMMIT_SUCCESS, COMMIT_FAILURE, LOAD_FAILURE_UNKNOWN } from '~/pipeline_editor/constants';
-import CommitForm from '~/pipeline_editor/components/commit/commit_form.vue';
-import getCiConfigData from '~/pipeline_editor/graphql/queries/ci_config.graphql';
-import PipelineEditorApp from '~/pipeline_editor/pipeline_editor_app.vue';
-import PipelineEditorHome from '~/pipeline_editor/pipeline_editor_home.vue';
-
 const localVue = createLocalVue();
 localVue.use(VueApollo);