diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-01 18:08:56 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-01 18:08:56 +0300 |
commit | e92c95bf459ea6237b1fe1cbd3e6fc7d0eca8f85 (patch) | |
tree | 080fec6e5ea63a30f6d1f313d585266e88db2344 /app/assets/javascripts/groups | |
parent | 9ecdb93f4e7e85ffc1e7a768780bb1279827a6aa (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/groups')
-rw-r--r-- | app/assets/javascripts/groups/components/group_item.vue | 3 | ||||
-rw-r--r-- | app/assets/javascripts/groups/groups_filterable_list.js | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/groups/components/group_item.vue b/app/assets/javascripts/groups/components/group_item.vue index 4082d05c9e9..a62369b1253 100644 --- a/app/assets/javascripts/groups/components/group_item.vue +++ b/app/assets/javascripts/groups/components/group_item.vue @@ -1,6 +1,7 @@ <script> /* eslint-disable vue/no-v-html */ import { GlLoadingIcon, GlBadge, GlTooltipDirective } from '@gitlab/ui'; +import { showLearnGitLabGroupItemPopover } from '~/onboarding_issues'; import { visitUrl } from '../../lib/utils/url_utility'; import identicon from '../../vue_shared/components/identicon.vue'; import eventHub from '../event_hub'; @@ -12,8 +13,6 @@ import itemStats from './item_stats.vue'; import itemStatsValue from './item_stats_value.vue'; import itemActions from './item_actions.vue'; -import { showLearnGitLabGroupItemPopover } from '~/onboarding_issues'; - export default { directives: { GlTooltip: GlTooltipDirective, diff --git a/app/assets/javascripts/groups/groups_filterable_list.js b/app/assets/javascripts/groups/groups_filterable_list.js index c33ad8b6ecb..cedf16cd7f1 100644 --- a/app/assets/javascripts/groups/groups_filterable_list.js +++ b/app/assets/javascripts/groups/groups_filterable_list.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import FilterableList from '~/filterable_list'; -import eventHub from './event_hub'; import { normalizeHeaders, getParameterByName } from '../lib/utils/common_utils'; +import eventHub from './event_hub'; export default class GroupFilterableList extends FilterableList { constructor({ |