Add latest changes from gitlab-org/gitlab@master

5 files changed, 5 insertions, 5 deletions

diff --git a/spec/frontend/notes/components/comment_form_spec.js b/spec/frontend/notes/components/comment_form_spec.js
index 475ea4f0f7d..10d92e9535c 100644
--- a/spec/frontend/notes/components/comment_form_spec.js
+++ b/spec/frontend/notes/components/comment_form_spec.js
@@ -2,12 +2,12 @@ import $ from 'jquery';
 import { mount } from '@vue/test-utils';
 import MockAdapter from 'axios-mock-adapter';
 import Autosize from 'autosize';
+import { trimText } from 'helpers/text_helper';
 import axios from '~/lib/utils/axios_utils';
 import createStore from '~/notes/stores';
 import CommentForm from '~/notes/components/comment_form.vue';
 import * as constants from '~/notes/constants';
 import { refreshUserMergeRequestCounts } from '~/commons/nav/user_merge_requests';
-import { trimText } from 'helpers/text_helper';
 import { keyboardDownEvent } from '../../issue_show/helpers';
 import {
   loggedOutnoteableData,
diff --git a/spec/frontend/notes/components/discussion_actions_spec.js b/spec/frontend/notes/components/discussion_actions_spec.js
index 3ccfea121b0..6198f8b3c1d 100644
--- a/spec/frontend/notes/components/discussion_actions_spec.js
+++ b/spec/frontend/notes/components/discussion_actions_spec.js
@@ -1,4 +1,3 @@
-import createStore from '~/notes/stores';
 import { shallowMount, mount, createLocalVue } from '@vue/test-utils';
 import { discussionMock } from '../../notes/mock_data';
 import DiscussionActions from '~/notes/components/discussion_actions.vue';
@@ -6,6 +5,7 @@ import ReplyPlaceholder from '~/notes/components/discussion_reply_placeholder.vu
 import ResolveDiscussionButton from '~/notes/components/discussion_resolve_button.vue';
 import ResolveWithIssueButton from '~/notes/components/discussion_resolve_with_issue_button.vue';
 import JumpToNextDiscussionButton from '~/notes/components/discussion_jump_to_next_button.vue';
+import createStore from '~/notes/stores';
 
 // NOTE: clone mock_data so that it is not accidentally mutated
 const createDiscussionMock = (props = {}) =>
diff --git a/spec/frontend/notes/components/discussion_jump_to_next_button_spec.js b/spec/frontend/notes/components/discussion_jump_to_next_button_spec.js
index ed173eacfab..3986340b6fd 100644
--- a/spec/frontend/notes/components/discussion_jump_to_next_button_spec.js
+++ b/spec/frontend/notes/components/discussion_jump_to_next_button_spec.js
@@ -1,5 +1,5 @@
-import JumpToNextDiscussionButton from '~/notes/components/discussion_jump_to_next_button.vue';
 import { shallowMount } from '@vue/test-utils';
+import JumpToNextDiscussionButton from '~/notes/components/discussion_jump_to_next_button.vue';
 
 describe('JumpToNextDiscussionButton', () => {
   let wrapper;
diff --git a/spec/frontend/notes/components/discussion_reply_placeholder_spec.js b/spec/frontend/notes/components/discussion_reply_placeholder_spec.js
index e008f4ed093..3152b6ff241 100644
--- a/spec/frontend/notes/components/discussion_reply_placeholder_spec.js
+++ b/spec/frontend/notes/components/discussion_reply_placeholder_spec.js
@@ -1,5 +1,5 @@
-import ReplyPlaceholder from '~/notes/components/discussion_reply_placeholder.vue';
 import { shallowMount, createLocalVue } from '@vue/test-utils';
+import ReplyPlaceholder from '~/notes/components/discussion_reply_placeholder.vue';
 
 const localVue = createLocalVue();
 const buttonText = 'Test Button Text';
diff --git a/spec/frontend/notes/components/discussion_resolve_button_spec.js b/spec/frontend/notes/components/discussion_resolve_button_spec.js
index 5024f40ec5d..1fae19f4492 100644
--- a/spec/frontend/notes/components/discussion_resolve_button_spec.js
+++ b/spec/frontend/notes/components/discussion_resolve_button_spec.js
@@ -1,5 +1,5 @@
-import resolveDiscussionButton from '~/notes/components/discussion_resolve_button.vue';
 import { createLocalVue, shallowMount } from '@vue/test-utils';
+import resolveDiscussionButton from '~/notes/components/discussion_resolve_button.vue';
 
 const buttonTitle = 'Resolve discussion';