From 93c6764dacd4c605027ef1cd367d3aebe420b223 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 9 Dec 2019 12:07:58 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 spec/frontend/releases/detail/store/actions_spec.js                   | 2 +-
 spec/frontend/releases/list/components/release_block_footer_spec.js   | 4 ++--
 .../releases/list/components/release_block_milestone_info_spec.js     | 2 +-
 spec/frontend/releases/list/components/release_block_spec.js          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'spec/frontend/releases')

diff --git a/spec/frontend/releases/detail/store/actions_spec.js b/spec/frontend/releases/detail/store/actions_spec.js
index f1c7f3c1048..5a1447aa4fc 100644
--- a/spec/frontend/releases/detail/store/actions_spec.js
+++ b/spec/frontend/releases/detail/store/actions_spec.js
@@ -1,7 +1,7 @@
 import axios from 'axios';
 import MockAdapter from 'axios-mock-adapter';
-import * as actions from '~/releases/detail/store/actions';
 import testAction from 'helpers/vuex_action_helper';
+import * as actions from '~/releases/detail/store/actions';
 import * as types from '~/releases/detail/store/mutation_types';
 import { release } from '../../mock_data';
 import state from '~/releases/detail/store/state';
diff --git a/spec/frontend/releases/list/components/release_block_footer_spec.js b/spec/frontend/releases/list/components/release_block_footer_spec.js
index 172147f1cc8..36a94b21df1 100644
--- a/spec/frontend/releases/list/components/release_block_footer_spec.js
+++ b/spec/frontend/releases/list/components/release_block_footer_spec.js
@@ -1,8 +1,8 @@
 import { mount } from '@vue/test-utils';
-import ReleaseBlockFooter from '~/releases/list/components/release_block_footer.vue';
-import Icon from '~/vue_shared/components/icon.vue';
 import { GlLink } from '@gitlab/ui';
 import { trimText } from 'helpers/text_helper';
+import ReleaseBlockFooter from '~/releases/list/components/release_block_footer.vue';
+import Icon from '~/vue_shared/components/icon.vue';
 import { release } from '../../mock_data';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 
diff --git a/spec/frontend/releases/list/components/release_block_milestone_info_spec.js b/spec/frontend/releases/list/components/release_block_milestone_info_spec.js
index c7d1bc3c372..7179ab3d3cc 100644
--- a/spec/frontend/releases/list/components/release_block_milestone_info_spec.js
+++ b/spec/frontend/releases/list/components/release_block_milestone_info_spec.js
@@ -1,8 +1,8 @@
 import { mount } from '@vue/test-utils';
 import { GlProgressBar, GlLink, GlBadge, GlButton } from '@gitlab/ui';
+import { trimText } from 'helpers/text_helper';
 import ReleaseBlockMilestoneInfo from '~/releases/list/components/release_block_milestone_info.vue';
 import { milestones } from '../../mock_data';
-import { trimText } from 'helpers/text_helper';
 import { MAX_MILESTONES_TO_DISPLAY } from '~/releases/list/constants';
 
 describe('Release block milestone info', () => {
diff --git a/spec/frontend/releases/list/components/release_block_spec.js b/spec/frontend/releases/list/components/release_block_spec.js
index c7a1cbdea17..c83af01f6e0 100644
--- a/spec/frontend/releases/list/components/release_block_spec.js
+++ b/spec/frontend/releases/list/components/release_block_spec.js
@@ -1,9 +1,9 @@
 import { mount } from '@vue/test-utils';
+import { first } from 'underscore';
 import EvidenceBlock from '~/releases/list/components/evidence_block.vue';
 import ReleaseBlock from '~/releases/list/components/release_block.vue';
 import ReleaseBlockFooter from '~/releases/list/components/release_block_footer.vue';
 import timeagoMixin from '~/vue_shared/mixins/timeago';
-import { first } from 'underscore';
 import { release } from '../../mock_data';
 import Icon from '~/vue_shared/components/icon.vue';
 import { scrollToElement } from '~/lib/utils/common_utils';
-- 
cgit v1.2.3