From 835f1214dcc4e08e3076f269b7b2aa854ea4257a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sun, 14 Feb 2021 18:09:20 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/frontend/notes/old_notes_spec.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'spec/frontend/notes/old_notes_spec.js') 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. -- cgit v1.2.1