diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-16 13:42:19 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-16 13:42:19 +0300 |
commit | 84d1bd786125c1c14a3ba5f63e38a4cc736a9027 (patch) | |
tree | f550fa965f507077e20dbb6d61a8269a99ef7107 /app/assets/javascripts/groups/settings/components | |
parent | 3a105e36e689f7b75482236712f1a47fd5a76814 (diff) |
Add latest changes from gitlab-org/gitlab@16-8-stable-eev16.8.0-rc42
Diffstat (limited to 'app/assets/javascripts/groups/settings/components')
-rw-r--r-- | app/assets/javascripts/groups/settings/components/access_dropdown.vue | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/groups/settings/components/access_dropdown.vue b/app/assets/javascripts/groups/settings/components/access_dropdown.vue index 457a2db174c..fee1383c8e2 100644 --- a/app/assets/javascripts/groups/settings/components/access_dropdown.vue +++ b/app/assets/javascripts/groups/settings/components/access_dropdown.vue @@ -93,7 +93,11 @@ export default { this.loading = true; if (this.hasLicense) { - Promise.all([this.groups.length ? Promise.resolve({ data: this.groups }) : getSubGroups()]) + Promise.all([ + this.groups.length + ? Promise.resolve({ data: this.groups }) + : getSubGroups({ includeParentDescendants: true }), + ]) .then(([groupsResponse]) => { this.consolidateData(groupsResponse.data); this.setSelected({ initial }); |