Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 3 deletions

diff --git a/spec/javascripts/feature_highlight/feature_highlight_helper_spec.js b/spec/javascripts/feature_highlight/feature_highlight_helper_spec.js
index e5795d4cbb1..ba35f7bf7c6 100644
--- a/spec/javascripts/feature_highlight/feature_highlight_helper_spec.js
+++ b/spec/javascripts/feature_highlight/feature_highlight_helper_spec.js
@@ -1,11 +1,10 @@
 import $ from 'jquery';
 import MockAdapter from 'axios-mock-adapter';
+import getSetTimeoutPromise from 'spec/helpers/set_timeout_promise_helper';
 import axios from '~/lib/utils/axios_utils';
 import { getSelector, dismiss, inserted } from '~/feature_highlight/feature_highlight_helper';
 import { togglePopover } from '~/shared/popover';
 
-import getSetTimeoutPromise from 'spec/helpers/set_timeout_promise_helper';
-
 describe('feature highlight helper', () => {
   describe('getSelector', () => {
     it('returns js-feature-highlight selector', () => {
diff --git a/spec/javascripts/feature_highlight/feature_highlight_spec.js b/spec/javascripts/feature_highlight/feature_highlight_spec.js
index 0a9fba789c3..40ac4bbb6a0 100644
--- a/spec/javascripts/feature_highlight/feature_highlight_spec.js
+++ b/spec/javascripts/feature_highlight/feature_highlight_spec.js
@@ -1,8 +1,8 @@
 import $ from 'jquery';
+import MockAdapter from 'axios-mock-adapter';
 import * as featureHighlight from '~/feature_highlight/feature_highlight';
 import * as popover from '~/shared/popover';
 import axios from '~/lib/utils/axios_utils';
-import MockAdapter from 'axios-mock-adapter';
 
 describe('feature highlight', () => {
   beforeEach(() => {