Add latest changes from gitlab-org/gitlab@master

7 files changed, 8 insertions, 8 deletions

diff --git a/spec/frontend/serverless/components/environment_row_spec.js b/spec/frontend/serverless/components/environment_row_spec.js
index 0ad85e218dc..866b2165917 100644
--- a/spec/frontend/serverless/components/environment_row_spec.js
+++ b/spec/frontend/serverless/components/environment_row_spec.js
@@ -1,5 +1,5 @@
-import environmentRowComponent from '~/serverless/components/environment_row.vue';
 import { createLocalVue, shallowMount } from '@vue/test-utils';
+import environmentRowComponent from '~/serverless/components/environment_row.vue';
 
 import { mockServerlessFunctions, mockServerlessFunctionsDiffEnv } from '../mock_data';
 import { translate } from '~/serverless/utils';
diff --git a/spec/frontend/serverless/components/function_details_spec.js b/spec/frontend/serverless/components/function_details_spec.js
index 31348ff1194..27d3a43db27 100644
--- a/spec/frontend/serverless/components/function_details_spec.js
+++ b/spec/frontend/serverless/components/function_details_spec.js
@@ -1,7 +1,7 @@
 import Vuex from 'vuex';
 
-import functionDetailsComponent from '~/serverless/components/function_details.vue';
 import { createLocalVue, shallowMount } from '@vue/test-utils';
+import functionDetailsComponent from '~/serverless/components/function_details.vue';
 import { createStore } from '~/serverless/store';
 
 describe('functionDetailsComponent', () => {
diff --git a/spec/frontend/serverless/components/function_row_spec.js b/spec/frontend/serverless/components/function_row_spec.js
index 979f98c4832..559c55a1eb4 100644
--- a/spec/frontend/serverless/components/function_row_spec.js
+++ b/spec/frontend/serverless/components/function_row_spec.js
@@ -1,5 +1,5 @@
-import functionRowComponent from '~/serverless/components/function_row.vue';
 import { shallowMount } from '@vue/test-utils';
+import functionRowComponent from '~/serverless/components/function_row.vue';
 import Timeago from '~/vue_shared/components/time_ago_tooltip.vue';
 
 import { mockServerlessFunction } from '../mock_data';
diff --git a/spec/frontend/serverless/components/functions_spec.js b/spec/frontend/serverless/components/functions_spec.js
index d8a80f8031e..29d35b5f1a6 100644
--- a/spec/frontend/serverless/components/functions_spec.js
+++ b/spec/frontend/serverless/components/functions_spec.js
@@ -1,13 +1,13 @@
 import Vuex from 'vuex';
 import { GlLoadingIcon } from '@gitlab/ui';
 import AxiosMockAdapter from 'axios-mock-adapter';
+import { createLocalVue, shallowMount } from '@vue/test-utils';
+import { TEST_HOST } from 'helpers/test_constants';
 import axios from '~/lib/utils/axios_utils';
 import functionsComponent from '~/serverless/components/functions.vue';
-import { createLocalVue, shallowMount } from '@vue/test-utils';
 import { createStore } from '~/serverless/store';
 import EmptyState from '~/serverless/components/empty_state.vue';
 import EnvironmentRow from '~/serverless/components/environment_row.vue';
-import { TEST_HOST } from 'helpers/test_constants';
 import { mockServerlessFunctions } from '../mock_data';
 
 describe('functionsComponent', () => {
diff --git a/spec/frontend/serverless/components/missing_prometheus_spec.js b/spec/frontend/serverless/components/missing_prometheus_spec.js
index 5dbdccde2de..908f534b847 100644
--- a/spec/frontend/serverless/components/missing_prometheus_spec.js
+++ b/spec/frontend/serverless/components/missing_prometheus_spec.js
@@ -1,6 +1,6 @@
 import { GlButton } from '@gitlab/ui';
-import missingPrometheusComponent from '~/serverless/components/missing_prometheus.vue';
 import { shallowMount } from '@vue/test-utils';
+import missingPrometheusComponent from '~/serverless/components/missing_prometheus.vue';
 
 const createComponent = missingData =>
   shallowMount(missingPrometheusComponent, {
diff --git a/spec/frontend/serverless/components/pod_box_spec.js b/spec/frontend/serverless/components/pod_box_spec.js
index d82825d8f62..8563d29c56b 100644
--- a/spec/frontend/serverless/components/pod_box_spec.js
+++ b/spec/frontend/serverless/components/pod_box_spec.js
@@ -1,5 +1,5 @@
-import podBoxComponent from '~/serverless/components/pod_box.vue';
 import { shallowMount } from '@vue/test-utils';
+import podBoxComponent from '~/serverless/components/pod_box.vue';
 
 const createComponent = count =>
   shallowMount(podBoxComponent, {
diff --git a/spec/frontend/serverless/components/url_spec.js b/spec/frontend/serverless/components/url_spec.js
index 706441e8a8b..9b15df20a89 100644
--- a/spec/frontend/serverless/components/url_spec.js
+++ b/spec/frontend/serverless/components/url_spec.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
-import urlComponent from '~/serverless/components/url.vue';
 import { shallowMount } from '@vue/test-utils';
+import urlComponent from '~/serverless/components/url.vue';
 import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
 
 const createComponent = uri =>