diff options
author | Sean McGivern <sean@gitlab.com> | 2019-07-22 15:17:23 +0000 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2019-07-22 15:17:23 +0000 |
commit | e48851de62086b65c75a3dd802743e722d5d7be8 (patch) | |
tree | e41184b94bd2945a8d8fbaf6004cc8247fdd8ea4 /doc | |
parent | ffb39001616f0c9457785e44bcabfc7342e9f919 (diff) | |
parent | 6c4ddc409fe95215502b6427452715edd31b41ab (diff) | |
download | gitlab-ce-e48851de62086b65c75a3dd802743e722d5d7be8.tar.gz |
Merge branch 'maintainers-can-create-subgroup' into 'master'
Add a group setting to allow Maintainers to create sub-groups
See merge request gitlab-org/gitlab-ce!29718
Diffstat (limited to 'doc')
-rw-r--r-- | doc/user/group/subgroups/index.md | 24 | ||||
-rw-r--r-- | doc/user/permissions.md | 5 |
2 files changed, 21 insertions, 8 deletions
diff --git a/doc/user/group/subgroups/index.md b/doc/user/group/subgroups/index.md index 7c80c4b7928..2eb3fae1a85 100644 --- a/doc/user/group/subgroups/index.md +++ b/doc/user/group/subgroups/index.md @@ -74,14 +74,24 @@ structure. ## Creating a subgroup -NOTE: **Note:** -You must be an Owner of a group to create a subgroup. For -more information check the [permissions table](../../permissions.md#group-members-permissions). -For a list of words that are not allowed to be used as group names see the +To create a subgroup you must either be an Owner or a Maintainer of the +group, depending on the group's setting. + +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. + +For more information check the +[permissions table](../../permissions.md#group-members-permissions). For a list +of words that are not allowed to be used as group names see the [reserved names](../../reserved_names.md). -Users can always create subgroups if they are explicitly added as an Owner to -a parent group, even if group creation is disabled by an administrator in their -settings. + +Users can always create subgroups if they are explicitly added as an Owner (or +Maintainer, if that setting is enabled) to a parent group, even if group +creation is disabled by an administrator in their settings. To create a subgroup: diff --git a/doc/user/permissions.md b/doc/user/permissions.md index 619cf34b5c3..044be05b932 100644 --- a/doc/user/permissions.md +++ b/doc/user/permissions.md @@ -209,13 +209,16 @@ group. | Create project in group | | | ✓ | ✓ | ✓ | | Create/edit/delete group milestones | | | ✓ | ✓ | ✓ | | Enable/disable a dependency proxy **(PREMIUM)** | | | ✓ | ✓ | ✓ | +| Create subgroup | | | | ✓ (1) | ✓ | | Edit group | | | | | ✓ | -| Create subgroup | | | | | ✓ | | Manage group members | | | | | ✓ | | Remove group | | | | | ✓ | | Delete group epic **(ULTIMATE)** | | | | | ✓ | | View group Audit Events | | | | | ✓ | +- (1): Groups can be set to [allow either Owners or Owners and + Maintainers to create subgroups](group/subgroups/index.md#creating-a-subgroup) + ### Subgroup permissions When you add a member to a subgroup, they inherit the membership and |