diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-14 21:09:20 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-14 21:09:20 +0300 |
commit | 835f1214dcc4e08e3076f269b7b2aa854ea4257a (patch) | |
tree | 07366d250301a8b2a8d7f24d220f4db21b5f6f59 /app/assets/javascripts/jira_connect | |
parent | 8309ef26ed9ae22e3115a0203dfff302812c154a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/jira_connect')
4 files changed, 8 insertions, 9 deletions
diff --git a/app/assets/javascripts/jira_connect/components/app.vue b/app/assets/javascripts/jira_connect/components/app.vue index ed01c188752..a4ba86dc6a1 100644 --- a/app/assets/javascripts/jira_connect/components/app.vue +++ b/app/assets/javascripts/jira_connect/components/app.vue @@ -1,10 +1,10 @@ <script> -import { mapState } from 'vuex'; import { GlAlert, GlButton, GlModal, GlModalDirective } from '@gitlab/ui'; +import { mapState } from 'vuex'; +import { getLocation } from '~/jira_connect/api'; import { __ } from '~/locale'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import { getLocation } from '~/jira_connect/api'; import GroupsList from './groups_list.vue'; export default { diff --git a/app/assets/javascripts/jira_connect/components/groups_list.vue b/app/assets/javascripts/jira_connect/components/groups_list.vue index 8671ecaa78a..69f2903388c 100644 --- a/app/assets/javascripts/jira_connect/components/groups_list.vue +++ b/app/assets/javascripts/jira_connect/components/groups_list.vue @@ -1,9 +1,9 @@ <script> import { GlTabs, GlTab, GlLoadingIcon, GlPagination, GlAlert } from '@gitlab/ui'; -import { s__ } from '~/locale'; -import { parseIntPagination, normalizeHeaders } from '~/lib/utils/common_utils'; import { fetchGroups } from '~/jira_connect/api'; import { defaultPerPage } from '~/jira_connect/constants'; +import { parseIntPagination, normalizeHeaders } from '~/lib/utils/common_utils'; +import { s__ } from '~/locale'; import GroupsListItem from './groups_list_item.vue'; export default { diff --git a/app/assets/javascripts/jira_connect/components/groups_list_item.vue b/app/assets/javascripts/jira_connect/components/groups_list_item.vue index 305f440707e..69b09ab0a21 100644 --- a/app/assets/javascripts/jira_connect/components/groups_list_item.vue +++ b/app/assets/javascripts/jira_connect/components/groups_list_item.vue @@ -1,8 +1,7 @@ <script> import { GlAvatar, GlButton, GlIcon } from '@gitlab/ui'; -import { s__ } from '~/locale'; - import { addSubscription } from '~/jira_connect/api'; +import { s__ } from '~/locale'; export default { components: { diff --git a/app/assets/javascripts/jira_connect/index.js b/app/assets/javascripts/jira_connect/index.js index 082c74150c5..7191fce3c33 100644 --- a/app/assets/javascripts/jira_connect/index.js +++ b/app/assets/javascripts/jira_connect/index.js @@ -1,9 +1,9 @@ -import Vue from 'vue'; import setConfigs from '@gitlab/ui/dist/config'; -import Translate from '~/vue_shared/translate'; +import Vue from 'vue'; +import { addSubscription, removeSubscription, getLocation } from '~/jira_connect/api'; import GlFeatureFlagsPlugin from '~/vue_shared/gl_feature_flags_plugin'; +import Translate from '~/vue_shared/translate'; -import { addSubscription, removeSubscription, getLocation } from '~/jira_connect/api'; import JiraConnectApp from './components/app.vue'; import createStore from './store'; import { SET_ERROR_MESSAGE } from './store/mutation_types'; |