diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-01 18:07:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-01 18:07:25 +0300 |
commit | fe09bd4d74025ea828425c6ffb0236549d51163f (patch) | |
tree | 68ebb6980ef07bcac528f83d927809b4d063c002 /app/assets/javascripts/groups | |
parent | cf19a51fc5711144b26f7123c14f9b64a7597195 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/groups')
-rw-r--r-- | app/assets/javascripts/groups/index.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/groups/init_overview_tabs.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/groups/index.js b/app/assets/javascripts/groups/index.js index f6711bde7d0..f4981c020cd 100644 --- a/app/assets/javascripts/groups/index.js +++ b/app/assets/javascripts/groups/index.js @@ -2,11 +2,11 @@ import { GlToast } from '@gitlab/ui'; import Vue from 'vue'; import { parseBoolean } from '~/lib/utils/common_utils'; import UserCallout from '~/user_callout'; +import GroupItemComponent from 'jh_else_ce/groups/components/group_item.vue'; import Translate from '../vue_shared/translate'; 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'; diff --git a/app/assets/javascripts/groups/init_overview_tabs.js b/app/assets/javascripts/groups/init_overview_tabs.js index 4064520d1ca..ced5d76d8b9 100644 --- a/app/assets/javascripts/groups/init_overview_tabs.js +++ b/app/assets/javascripts/groups/init_overview_tabs.js @@ -2,8 +2,8 @@ import Vue from 'vue'; import VueRouter from 'vue-router'; import { GlToast } from '@gitlab/ui'; import { parseBoolean } from '~/lib/utils/common_utils'; +import GroupItem from 'jh_else_ce/groups/components/group_item.vue'; import GroupFolder from './components/group_folder.vue'; -import GroupItem from './components/group_item.vue'; import { ACTIVE_TAB_SUBGROUPS_AND_PROJECTS, ACTIVE_TAB_SHARED, |