diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-14 18:09:20 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-14 18:09:20 +0000 |
commit | 835f1214dcc4e08e3076f269b7b2aa854ea4257a (patch) | |
tree | 07366d250301a8b2a8d7f24d220f4db21b5f6f59 /spec/frontend/notes/old_notes_spec.js | |
parent | 8309ef26ed9ae22e3115a0203dfff302812c154a (diff) | |
download | gitlab-ce-835f1214dcc4e08e3076f269b7b2aa854ea4257a.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/notes/old_notes_spec.js')
-rw-r--r-- | spec/frontend/notes/old_notes_spec.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/frontend/notes/old_notes_spec.js b/spec/frontend/notes/old_notes_spec.js index 00821980e8a..432b660c4b3 100644 --- a/spec/frontend/notes/old_notes_spec.js +++ b/spec/frontend/notes/old_notes_spec.js @@ -1,13 +1,13 @@ /* eslint-disable import/no-commonjs, no-new */ -import $ from 'jquery'; import MockAdapter from 'axios-mock-adapter'; +import $ from 'jquery'; import '~/behaviors/markdown/render_gfm'; import { createSpyObj } from 'helpers/jest_helpers'; -import { setTestTimeoutOnce } from 'helpers/timeout'; import { TEST_HOST } from 'helpers/test_constants'; -import * as urlUtility from '~/lib/utils/url_utility'; +import { setTestTimeoutOnce } from 'helpers/timeout'; import axios from '~/lib/utils/axios_utils'; +import * as urlUtility from '~/lib/utils/url_utility'; // These must be imported synchronously because they pull dependencies // from the DOM. |