From 2832fc4971f316e6e1337afab9da8d65965a1338 Mon Sep 17 00:00:00 2001 From: Fabio Papa Date: Sun, 17 Nov 2019 12:16:09 -0800 Subject: [PATCH 1/3] Clarify documentation about subgroup creation setting Specify that group owners can change whether maintainers can create subgroups in the settings of the group, and that administrators can also change this setting in the admin area. --- doc/user/group/subgroups/index.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/user/group/subgroups/index.md b/doc/user/group/subgroups/index.md index 52b7035389a431..ffb724b00172df 100644 --- a/doc/user/group/subgroups/index.md +++ b/doc/user/group/subgroups/index.md @@ -81,7 +81,10 @@ By default, groups created in: - GitLab 12.2 or later allow both Owners and Maintainers to create subgroups. - GitLab 12.1 or earlier only allow Owners to create subgroups. -This setting can be for any group by an Owner or Administrator. +The setting affecting whether Maintainers can create subgroups can be changed +for any group by a group Owner (in the group's **General Settings**, under +**Permissions, LFS, 2FA**) or an Administrator (by editing the group in question +in the **Group** section of the **Admin** area) after the group has been created. For more information check the [permissions table](../../permissions.md#group-members-permissions). For a list -- GitLab From 491935a7e2c409b7494d6ccebae1b008a60d1916 Mon Sep 17 00:00:00 2001 From: Fabio Papa Date: Sun, 17 Nov 2019 12:58:02 -0800 Subject: [PATCH 2/3] Add changelog --- .../unreleased/doc-maintainer-subgroup-subtleties.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 changelogs/unreleased/doc-maintainer-subgroup-subtleties.yml diff --git a/changelogs/unreleased/doc-maintainer-subgroup-subtleties.yml b/changelogs/unreleased/doc-maintainer-subgroup-subtleties.yml new file mode 100644 index 00000000000000..605a329e6534da --- /dev/null +++ b/changelogs/unreleased/doc-maintainer-subgroup-subtleties.yml @@ -0,0 +1,6 @@ +--- +title: Properly document who is allowed to create subgroups and where the setting + can be changed +merge_request: 20260 +author: Fabio Papa +type: other -- GitLab From 7e3af79db6361dbdf163745d46415d2249a8320b Mon Sep 17 00:00:00 2001 From: Evan Read Date: Thu, 22 Oct 2020 00:09:15 +0000 Subject: [PATCH 3/3] Apply 1 suggestion(s) to 1 file(s) --- doc/user/group/subgroups/index.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/user/group/subgroups/index.md b/doc/user/group/subgroups/index.md index ffb724b00172df..724cec2f9fa181 100644 --- a/doc/user/group/subgroups/index.md +++ b/doc/user/group/subgroups/index.md @@ -81,10 +81,10 @@ By default, groups created in: - GitLab 12.2 or later allow both Owners and Maintainers to create subgroups. - GitLab 12.1 or earlier only allow Owners to create subgroups. -The setting affecting whether Maintainers can create subgroups can be changed -for any group by a group Owner (in the group's **General Settings**, under -**Permissions, LFS, 2FA**) or an Administrator (by editing the group in question -in the **Group** section of the **Admin** area) after the group has been created. +The setting can be changed for any group by: + +- A group owner in the group's **General Settings > Permissions, LFS, 2FA**. +- An administrator by editing the group in the **Group** section of the Admin Area. For more information check the [permissions table](../../permissions.md#group-members-permissions). For a list -- GitLab