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/groups | |
parent | 8309ef26ed9ae22e3115a0203dfff302812c154a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/groups')
8 files changed, 16 insertions, 16 deletions
diff --git a/app/assets/javascripts/groups/components/app.vue b/app/assets/javascripts/groups/components/app.vue index 4f26bab8bd3..9d2c7cfe581 100644 --- a/app/assets/javascripts/groups/components/app.vue +++ b/app/assets/javascripts/groups/components/app.vue @@ -2,13 +2,13 @@ /* global Flash */ import { GlLoadingIcon, GlModal } from '@gitlab/ui'; -import { __, s__, sprintf } from '~/locale'; -import { HIDDEN_CLASS } from '~/lib/utils/constants'; import { getParameterByName } from '~/lib/utils/common_utils'; +import { HIDDEN_CLASS } from '~/lib/utils/constants'; import { mergeUrlParams } from '~/lib/utils/url_utility'; +import { __, s__, sprintf } from '~/locale'; -import eventHub from '../event_hub'; import { COMMON_STR, CONTENT_LIST_CLASS } from '../constants'; +import eventHub from '../event_hub'; import groupsComponent from './groups.vue'; export default { diff --git a/app/assets/javascripts/groups/components/group_item.vue b/app/assets/javascripts/groups/components/group_item.vue index 0997fb3a98c..d41fa0b2410 100644 --- a/app/assets/javascripts/groups/components/group_item.vue +++ b/app/assets/javascripts/groups/components/group_item.vue @@ -3,14 +3,14 @@ import { GlLoadingIcon, GlBadge, GlTooltipDirective } from '@gitlab/ui'; import { visitUrl } from '../../lib/utils/url_utility'; import identicon from '../../vue_shared/components/identicon.vue'; -import eventHub from '../event_hub'; import { VISIBILITY_TYPE_ICON, GROUP_VISIBILITY_TYPE } from '../constants'; +import eventHub from '../event_hub'; +import itemActions from './item_actions.vue'; import itemCaret from './item_caret.vue'; -import itemTypeIcon from './item_type_icon.vue'; import itemStats from './item_stats.vue'; import itemStatsValue from './item_stats_value.vue'; -import itemActions from './item_actions.vue'; +import itemTypeIcon from './item_type_icon.vue'; export default { directives: { diff --git a/app/assets/javascripts/groups/components/groups.vue b/app/assets/javascripts/groups/components/groups.vue index c7713cbfafc..d407fdd2b90 100644 --- a/app/assets/javascripts/groups/components/groups.vue +++ b/app/assets/javascripts/groups/components/groups.vue @@ -1,7 +1,7 @@ <script> import PaginationLinks from '~/vue_shared/components/pagination_links.vue'; -import eventHub from '../event_hub'; import { getParameterByName } from '../../lib/utils/common_utils'; +import eventHub from '../event_hub'; export default { components: { diff --git a/app/assets/javascripts/groups/components/invite_members_banner.vue b/app/assets/javascripts/groups/components/invite_members_banner.vue index da7adab1d86..81c5e3ce85d 100644 --- a/app/assets/javascripts/groups/components/invite_members_banner.vue +++ b/app/assets/javascripts/groups/components/invite_members_banner.vue @@ -1,7 +1,7 @@ <script> import { GlBanner } from '@gitlab/ui'; -import { s__ } from '~/locale'; import { parseBoolean, setCookie, getCookie } from '~/lib/utils/common_utils'; +import { s__ } from '~/locale'; import Tracking from '~/tracking'; const trackingMixin = Tracking.mixin(); diff --git a/app/assets/javascripts/groups/components/item_actions.vue b/app/assets/javascripts/groups/components/item_actions.vue index ff52f5ef51c..df751a3f37e 100644 --- a/app/assets/javascripts/groups/components/item_actions.vue +++ b/app/assets/javascripts/groups/components/item_actions.vue @@ -1,7 +1,7 @@ <script> import { GlTooltipDirective, GlButton, GlModalDirective } from '@gitlab/ui'; -import eventHub from '../event_hub'; import { COMMON_STR } from '../constants'; +import eventHub from '../event_hub'; export default { components: { diff --git a/app/assets/javascripts/groups/index.js b/app/assets/javascripts/groups/index.js index 4fd2c12c9fe..c34810954a3 100644 --- a/app/assets/javascripts/groups/index.js +++ b/app/assets/javascripts/groups/index.js @@ -1,16 +1,16 @@ -import Vue from 'vue'; import { GlToast } from '@gitlab/ui'; -import UserCallout from '~/user_callout'; +import Vue from 'vue'; import { parseBoolean } from '~/lib/utils/common_utils'; +import UserCallout from '~/user_callout'; import Translate from '../vue_shared/translate'; -import GroupFilterableList from './groups_filterable_list'; -import GroupsStore from './store/groups_store'; -import GroupsService from './service/groups_service'; import groupsApp from './components/app.vue'; import groupFolderComponent from './components/group_folder.vue'; import groupItemComponent from './components/group_item.vue'; import { GROUPS_LIST_HOLDER_CLASS, CONTENT_LIST_CLASS } from './constants'; +import GroupFilterableList from './groups_filterable_list'; +import GroupsService from './service/groups_service'; +import GroupsStore from './store/groups_store'; Vue.use(Translate); diff --git a/app/assets/javascripts/groups/members/utils.js b/app/assets/javascripts/groups/members/utils.js index 71918bfe9f0..dc4eb7f4422 100644 --- a/app/assets/javascripts/groups/members/utils.js +++ b/app/assets/javascripts/groups/members/utils.js @@ -1,5 +1,5 @@ -import { baseRequestFormatter } from '~/members/utils'; import { MEMBER_ACCESS_LEVEL_PROPERTY_NAME } from '~/members/constants'; +import { baseRequestFormatter } from '~/members/utils'; import { GROUP_MEMBER_BASE_PROPERTY_NAME } from './constants'; export const groupMemberRequestFormatter = baseRequestFormatter( diff --git a/app/assets/javascripts/groups/transfer_dropdown.js b/app/assets/javascripts/groups/transfer_dropdown.js index 59cc779d2ae..d6343f698c0 100644 --- a/app/assets/javascripts/groups/transfer_dropdown.js +++ b/app/assets/javascripts/groups/transfer_dropdown.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import { __ } from '~/locale'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; +import { __ } from '~/locale'; export default class TransferDropdown { constructor() { |