Add latest changes from gitlab-org/gitlab@master

8 files changed, 9 insertions, 10 deletions

diff --git a/spec/javascripts/sidebar/assignee_title_spec.js b/spec/javascripts/sidebar/assignee_title_spec.js
index 6c65a55ff29..0496e280a21 100644
--- a/spec/javascripts/sidebar/assignee_title_spec.js
+++ b/spec/javascripts/sidebar/assignee_title_spec.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
-import AssigneeTitle from '~/sidebar/components/assignees/assignee_title.vue';
 import { mockTracking, triggerEvent } from 'spec/helpers/tracking_helper';
+import AssigneeTitle from '~/sidebar/components/assignees/assignee_title.vue';
 
 describe('AssigneeTitle component', () => {
   let component;
diff --git a/spec/javascripts/sidebar/components/time_tracking/time_tracker_spec.js b/spec/javascripts/sidebar/components/time_tracking/time_tracker_spec.js
index ab28190ae64..1580f32cfca 100644
--- a/spec/javascripts/sidebar/components/time_tracking/time_tracker_spec.js
+++ b/spec/javascripts/sidebar/components/time_tracking/time_tracker_spec.js
@@ -1,8 +1,7 @@
 import Vue from 'vue';
 
-import TimeTracker from '~/sidebar/components/time_tracking/time_tracker.vue';
-
 import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import TimeTracker from '~/sidebar/components/time_tracking/time_tracker.vue';
 
 describe('Issuable Time Tracker', () => {
   let initialData;
diff --git a/spec/javascripts/sidebar/lock/edit_form_buttons_spec.js b/spec/javascripts/sidebar/lock/edit_form_buttons_spec.js
index 330f59f08b2..c532554efb4 100644
--- a/spec/javascripts/sidebar/lock/edit_form_buttons_spec.js
+++ b/spec/javascripts/sidebar/lock/edit_form_buttons_spec.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
-import editFormButtons from '~/sidebar/components/lock/edit_form_buttons.vue';
 import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import editFormButtons from '~/sidebar/components/lock/edit_form_buttons.vue';
 
 describe('EditFormButtons', () => {
   let vm1;
diff --git a/spec/javascripts/sidebar/lock/lock_issue_sidebar_spec.js b/spec/javascripts/sidebar/lock/lock_issue_sidebar_spec.js
index decccbb8964..0a3f0d6901f 100644
--- a/spec/javascripts/sidebar/lock/lock_issue_sidebar_spec.js
+++ b/spec/javascripts/sidebar/lock/lock_issue_sidebar_spec.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
-import lockIssueSidebar from '~/sidebar/components/lock/lock_issue_sidebar.vue';
 import { mockTracking, triggerEvent } from 'spec/helpers/tracking_helper';
+import lockIssueSidebar from '~/sidebar/components/lock/lock_issue_sidebar.vue';
 
 describe('LockIssueSidebar', () => {
   let vm1;
diff --git a/spec/javascripts/sidebar/participants_spec.js b/spec/javascripts/sidebar/participants_spec.js
index eb360fd256a..8d8ec5884f6 100644
--- a/spec/javascripts/sidebar/participants_spec.js
+++ b/spec/javascripts/sidebar/participants_spec.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
-import participants from '~/sidebar/components/participants/participants.vue';
 import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import participants from '~/sidebar/components/participants/participants.vue';
 
 const PARTICIPANT = {
   id: 1,
diff --git a/spec/javascripts/sidebar/sidebar_assignees_spec.js b/spec/javascripts/sidebar/sidebar_assignees_spec.js
index e808f4003ff..23b8dc69925 100644
--- a/spec/javascripts/sidebar/sidebar_assignees_spec.js
+++ b/spec/javascripts/sidebar/sidebar_assignees_spec.js
@@ -1,9 +1,9 @@
 import Vue from 'vue';
+import mountComponent from 'spec/helpers/vue_mount_component_helper';
 import SidebarAssignees from '~/sidebar/components/assignees/sidebar_assignees.vue';
 import SidebarMediator from '~/sidebar/sidebar_mediator';
 import SidebarService from '~/sidebar/services/sidebar_service';
 import SidebarStore from '~/sidebar/stores/sidebar_store';
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
 import Mock from './mock_data';
 
 describe('sidebar assignees', () => {
diff --git a/spec/javascripts/sidebar/sidebar_subscriptions_spec.js b/spec/javascripts/sidebar/sidebar_subscriptions_spec.js
index 88f64244237..ee4516f3bcd 100644
--- a/spec/javascripts/sidebar/sidebar_subscriptions_spec.js
+++ b/spec/javascripts/sidebar/sidebar_subscriptions_spec.js
@@ -1,9 +1,9 @@
 import Vue from 'vue';
+import mountComponent from 'spec/helpers/vue_mount_component_helper';
 import sidebarSubscriptions from '~/sidebar/components/subscriptions/sidebar_subscriptions.vue';
 import SidebarMediator from '~/sidebar/sidebar_mediator';
 import SidebarService from '~/sidebar/services/sidebar_service';
 import SidebarStore from '~/sidebar/stores/sidebar_store';
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
 import Mock from './mock_data';
 
 describe('Sidebar Subscriptions', function() {
diff --git a/spec/javascripts/sidebar/subscriptions_spec.js b/spec/javascripts/sidebar/subscriptions_spec.js
index 1256852c472..cdb39efbef8 100644
--- a/spec/javascripts/sidebar/subscriptions_spec.js
+++ b/spec/javascripts/sidebar/subscriptions_spec.js
@@ -1,8 +1,8 @@
 import Vue from 'vue';
-import subscriptions from '~/sidebar/components/subscriptions/subscriptions.vue';
-import eventHub from '~/sidebar/event_hub';
 import mountComponent from 'spec/helpers/vue_mount_component_helper';
 import { mockTracking } from 'spec/helpers/tracking_helper';
+import subscriptions from '~/sidebar/components/subscriptions/subscriptions.vue';
+import eventHub from '~/sidebar/event_hub';
 
 describe('Subscriptions', function() {
   let vm;