diff options
| author | Fabio Papa <fabtheman@gmail.com> | 2019-07-05 08:31:57 -0700 |
|---|---|---|
| committer | Fabio Papa <fabtheman@gmail.com> | 2019-07-05 08:31:57 -0700 |
| commit | 98745a76dcbf7290c8299bdb3cfe8d0e36723fa8 (patch) | |
| tree | fc0537905a0e1fe862625c33a301b5a2b36b2437 | |
| parent | 11e2eb79f332f4fd5533b8e0b16ce5c7600b4833 (diff) | |
| parent | 51fa8a5e778ff6909fd7f70fc8062bb33940a822 (diff) | |
| download | gitlab-ce-98745a76dcbf7290c8299bdb3cfe8d0e36723fa8.tar.gz | |
Merge branch 'maintainers-can-create-subgroup' of https://gitlab.com/fapapa/gitlab-ce into maintainers-can-create-subgroup
| -rw-r--r-- | doc/user/group/subgroups/index.md | 22 | ||||
| -rw-r--r-- | doc/user/permissions.md | 4 |
2 files changed, 14 insertions, 12 deletions
diff --git a/doc/user/group/subgroups/index.md b/doc/user/group/subgroups/index.md index e3f7539a9b6..b9313ccdb1e 100644 --- a/doc/user/group/subgroups/index.md +++ b/doc/user/group/subgroups/index.md @@ -74,17 +74,19 @@ structure. ## Creating a subgroup -NOTE: **Note:** -In order 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 allow both Owners and +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 allow both Owners and Maintainers to create subgroups, but this can be changed by an Owner or -Administrator to only allow Owners to create subgroups. 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 (or Maintainer, if that setting is -enabled) to a parent group, even if group creation is disabled by an -administrator in their settings. +Administrator to only allow Owners to create subgroups. + +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 (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 20b23b75cb9..10184de8784 100644 --- a/doc/user/permissions.md +++ b/doc/user/permissions.md @@ -209,14 +209,14 @@ group. | Create project in group | | | ✓ | ✓ | ✓ | | Create/edit/delete group milestones | | | ✓ | ✓ | ✓ | | Enable/disable a dependency proxy **[PREMIUM]** | | | ✓ | ✓ | ✓ | -| Create subgroup | | | | ✓* | ✓ | +| Create subgroup | | | | ✓ (1) | ✓ | | Edit group | | | | | ✓ | | Manage group members | | | | | ✓ | | Remove group | | | | | ✓ | | Delete group epic **[ULTIMATE]** | | | | | ✓ | | View group Audit Events | | | | | ✓ | -*Groups can be set to allow either Owners or Owners and maintainers to create subgroups +- (1): Groups can be set to allow either Owners or Owners and Maintainers to create subgroups ### Subgroup permissions |