Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 4 deletions

diff --git a/app/assets/javascripts/feature_highlight/feature_highlight_helper.js b/app/assets/javascripts/feature_highlight/feature_highlight_helper.js
index fabc905d756..0f460a83c07 100644
--- a/app/assets/javascripts/feature_highlight/feature_highlight_helper.js
+++ b/app/assets/javascripts/feature_highlight/feature_highlight_helper.js
@@ -1,8 +1,8 @@
 import $ from 'jquery';
-import axios from '../lib/utils/axios_utils';
-import { __ } from '../locale';
 import { deprecatedCreateFlash as Flash } from '../flash';
 import LazyLoader from '../lazy_loader';
+import axios from '../lib/utils/axios_utils';
+import { __ } from '../locale';
 import { togglePopover } from '../shared/popover';
 
 export const getSelector = (highlightId) => `.js-feature-highlight[data-highlight=${highlightId}]`;
diff --git a/app/assets/javascripts/feature_highlight/feature_highlight_popover.vue b/app/assets/javascripts/feature_highlight/feature_highlight_popover.vue
index 879427eef96..2fd92a1bb11 100644
--- a/app/assets/javascripts/feature_highlight/feature_highlight_popover.vue
+++ b/app/assets/javascripts/feature_highlight/feature_highlight_popover.vue
@@ -1,4 +1,5 @@
 <script>
+import clusterPopover from '@gitlab/svgs/dist/illustrations/cluster_popover.svg';
 import {
   GlPopover,
   GlSprintf,
@@ -6,10 +7,9 @@ import {
   GlButton,
   GlSafeHtmlDirective as SafeHtml,
 } from '@gitlab/ui';
-import clusterPopover from '@gitlab/svgs/dist/illustrations/cluster_popover.svg';
 import { __ } from '~/locale';
-import { dismiss } from './feature_highlight_helper';
 import { POPOVER_TARGET_ID } from './constants';
+import { dismiss } from './feature_highlight_helper';
 
 export default {
   components: {