Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 4 deletions

diff --git a/app/assets/javascripts/custom_metrics/components/custom_metrics_form.vue b/app/assets/javascripts/custom_metrics/components/custom_metrics_form.vue
index 1b32225d251..3158ae9b126 100644
--- a/app/assets/javascripts/custom_metrics/components/custom_metrics_form.vue
+++ b/app/assets/javascripts/custom_metrics/components/custom_metrics_form.vue
@@ -1,7 +1,7 @@
 <script>
 import { GlButton } from '@gitlab/ui';
-import { __, s__ } from '~/locale';
 import csrf from '~/lib/utils/csrf';
+import { __, s__ } from '~/locale';
 import { formDataValidator } from '../constants';
 import CustomMetricsFormFields from './custom_metrics_form_fields.vue';
 import DeleteCustomMetricModal from './delete_custom_metric_modal.vue';
diff --git a/app/assets/javascripts/custom_metrics/components/custom_metrics_form_fields.vue b/app/assets/javascripts/custom_metrics/components/custom_metrics_form_fields.vue
index f3fa28dc2f3..0aae63e1648 100644
--- a/app/assets/javascripts/custom_metrics/components/custom_metrics_form_fields.vue
+++ b/app/assets/javascripts/custom_metrics/components/custom_metrics_form_fields.vue
@@ -8,11 +8,11 @@ import {
   GlIcon,
 } from '@gitlab/ui';
 import { debounce } from 'lodash';
-import { __, s__ } from '~/locale';
-import csrf from '~/lib/utils/csrf';
 import axios from '~/lib/utils/axios_utils';
-import statusCodes from '~/lib/utils/http_status';
 import { backOff } from '~/lib/utils/common_utils';
+import csrf from '~/lib/utils/csrf';
+import statusCodes from '~/lib/utils/http_status';
+import { __, s__ } from '~/locale';
 import { queryTypes, formDataValidator } from '../constants';
 
 const VALIDATION_REQUEST_TIMEOUT = 10000;