diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-05 15:13:17 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-05 15:13:17 +0300 |
commit | cd17aa65132de074aab9ae50ab7bbf7f16428546 (patch) | |
tree | 5a195a869320321aa9c3891e7ba5bbc9b9fc5d87 /app/assets/javascripts/groups | |
parent | 508f0c4ee719abb1294684eea4a63aa44cd23597 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/groups')
5 files changed, 9 insertions, 4 deletions
diff --git a/app/assets/javascripts/groups/components/empty_states/archived_projects_empty_state.vue b/app/assets/javascripts/groups/components/empty_states/archived_projects_empty_state.vue index 535758750f9..cba13c11c5d 100644 --- a/app/assets/javascripts/groups/components/empty_states/archived_projects_empty_state.vue +++ b/app/assets/javascripts/groups/components/empty_states/archived_projects_empty_state.vue @@ -8,14 +8,14 @@ export default { i18n: { title: s__('GroupsEmptyState|No archived projects.'), }, - inject: ['newProjectIllustration'], + inject: ['emptyProjectsIllustration'], }; </script> <template> <gl-empty-state :title="$options.i18n.title" - :svg-path="newProjectIllustration" + :svg-path="emptyProjectsIllustration" :svg-height="100" /> </template> diff --git a/app/assets/javascripts/groups/components/empty_states/shared_projects_empty_state.vue b/app/assets/javascripts/groups/components/empty_states/shared_projects_empty_state.vue index 7223321bf3e..7c691b56a43 100644 --- a/app/assets/javascripts/groups/components/empty_states/shared_projects_empty_state.vue +++ b/app/assets/javascripts/groups/components/empty_states/shared_projects_empty_state.vue @@ -8,14 +8,14 @@ export default { i18n: { title: s__('GroupsEmptyState|No shared projects.'), }, - inject: ['newProjectIllustration'], + inject: ['emptyProjectsIllustration'], }; </script> <template> <gl-empty-state :title="$options.i18n.title" - :svg-path="newProjectIllustration" + :svg-path="emptyProjectsIllustration" :svg-height="100" /> </template> diff --git a/app/assets/javascripts/groups/components/empty_states/subgroups_and_projects_empty_state.vue b/app/assets/javascripts/groups/components/empty_states/subgroups_and_projects_empty_state.vue index 763abaebebb..a2359082149 100644 --- a/app/assets/javascripts/groups/components/empty_states/subgroups_and_projects_empty_state.vue +++ b/app/assets/javascripts/groups/components/empty_states/subgroups_and_projects_empty_state.vue @@ -43,6 +43,7 @@ export default { 'newProjectPath', 'newSubgroupIllustration', 'newProjectIllustration', + 'emptyProjectsIllustration', 'emptySubgroupIllustration', 'canCreateSubgroups', 'canCreateProjects', diff --git a/app/assets/javascripts/groups/index.js b/app/assets/javascripts/groups/index.js index c3bf3f28509..f6711bde7d0 100644 --- a/app/assets/javascripts/groups/index.js +++ b/app/assets/javascripts/groups/index.js @@ -51,6 +51,7 @@ export default (containerId = 'js-groups-tree', endpoint, action = '') => { newProjectPath, newSubgroupIllustration, newProjectIllustration, + emptyProjectsIllustration, emptySubgroupIllustration, canCreateSubgroups, canCreateProjects, @@ -63,6 +64,7 @@ export default (containerId = 'js-groups-tree', endpoint, action = '') => { newProjectPath, newSubgroupIllustration, newProjectIllustration, + emptyProjectsIllustration, emptySubgroupIllustration, canCreateSubgroups: parseBoolean(canCreateSubgroups), canCreateProjects: parseBoolean(canCreateProjects), diff --git a/app/assets/javascripts/groups/init_overview_tabs.js b/app/assets/javascripts/groups/init_overview_tabs.js index 664d07ca13d..4064520d1ca 100644 --- a/app/assets/javascripts/groups/init_overview_tabs.js +++ b/app/assets/javascripts/groups/init_overview_tabs.js @@ -44,6 +44,7 @@ export const initGroupOverviewTabs = () => { newProjectPath, newSubgroupIllustration, newProjectIllustration, + emptyProjectsIllustration, emptySubgroupIllustration, canCreateSubgroups, canCreateProjects, @@ -62,6 +63,7 @@ export const initGroupOverviewTabs = () => { newProjectPath, newSubgroupIllustration, newProjectIllustration, + emptyProjectsIllustration, emptySubgroupIllustration, canCreateSubgroups: parseBoolean(canCreateSubgroups), canCreateProjects: parseBoolean(canCreateProjects), |