From 37e16ccd1a9ce1a63759a916d75e441e95cb54f0 Mon Sep 17 00:00:00 2001 From: dappelt Date: Mon, 17 Sep 2018 13:10:46 +0200 Subject: [PATCH 1/4] Clarify subgroup permissions --- doc/user/group/subgroups/index.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/user/group/subgroups/index.md b/doc/user/group/subgroups/index.md index b55946a788f..489094fadc4 100644 --- a/doc/user/group/subgroups/index.md +++ b/doc/user/group/subgroups/index.md @@ -140,8 +140,10 @@ From the image above, we can deduct the following things: You need to be an Owner of a group in order to be able to add members to it. To override a user's membership of an ancestor group (the first group they were -added to), simply add the user in the new subgroup again, but with different -permissions. +added to), simply add the user in the new subgroup again, but with a higher set of +permissions. Note that a user's permissions in a subgroup cannot be lower +than in any of its ancestor groups and, hence, you cannot reduce a user's permissions +in a subgroup with respect to its ancestor groups. For example, if User0 was first added to group `group-1/group-1-1` with Developer permissions, then they will inherit those permissions in every other subgroup From e2df834afe965bc1091b48f0b34f119fa7ede53e Mon Sep 17 00:00:00 2001 From: dappelt Date: Wed, 19 Sep 2018 13:22:33 +0200 Subject: [PATCH 2/4] Address Evan's comments --- doc/user/group/subgroups/index.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/user/group/subgroups/index.md b/doc/user/group/subgroups/index.md index 489094fadc4..70555a893bb 100644 --- a/doc/user/group/subgroups/index.md +++ b/doc/user/group/subgroups/index.md @@ -139,11 +139,12 @@ From the image above, we can deduct the following things: >**Note:** You need to be an Owner of a group in order to be able to add members to it. +>**Note:** +A user's permissions in a subgroup cannot be lower than in any of its ancestor groups. +Therefore, you cannot reduce a user's permissions in a subgroup with respect to its ancestor groups. + To override a user's membership of an ancestor group (the first group they were -added to), simply add the user in the new subgroup again, but with a higher set of -permissions. Note that a user's permissions in a subgroup cannot be lower -than in any of its ancestor groups and, hence, you cannot reduce a user's permissions -in a subgroup with respect to its ancestor groups. +added to), add the user to the new subgroup again with a higher set of permissions. For example, if User0 was first added to group `group-1/group-1-1` with Developer permissions, then they will inherit those permissions in every other subgroup From 280914c28025831a5f63c981442c84a870af654e Mon Sep 17 00:00:00 2001 From: dappelt Date: Fri, 21 Sep 2018 13:39:05 +0200 Subject: [PATCH 3/4] Update render style of note boxes --- 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 70555a893bb..edd2f718176 100644 --- a/doc/user/group/subgroups/index.md +++ b/doc/user/group/subgroups/index.md @@ -1,6 +1,6 @@ # Subgroups -> **Notes:** +NOTE: **Note:** > - [Introduced][ce-2772] in GitLab 9.0. > - Not available when using MySQL as external database (support removed in > GitLab 9.3 [due to performance reasons][issue]). @@ -79,7 +79,7 @@ structure. ## Creating a subgroup -> **Notes:** +NOTE: **Note:** > - You need to be an Owner of a group in order to be able to create > a subgroup. For more information check the [permissions table][permissions]. > - For a list of words that are not allowed to be used as group names see the @@ -136,10 +136,10 @@ From the image above, we can deduct the following things: ### Overriding the ancestor group membership ->**Note:** +NOTE: **Note:** You need to be an Owner of a group in order to be able to add members to it. ->**Note:** +NOTE: **Note:** A user's permissions in a subgroup cannot be lower than in any of its ancestor groups. Therefore, you cannot reduce a user's permissions in a subgroup with respect to its ancestor groups. From de7dd2239e8486c7cbe850e4d5a1ede77d09de2b Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Fri, 28 Sep 2018 10:29:00 +0000 Subject: [PATCH 4/4] Update notes notation in subgroups docs --- doc/user/group/subgroups/index.md | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/doc/user/group/subgroups/index.md b/doc/user/group/subgroups/index.md index edd2f718176..8db36c4a0e8 100644 --- a/doc/user/group/subgroups/index.md +++ b/doc/user/group/subgroups/index.md @@ -1,9 +1,8 @@ # Subgroups NOTE: **Note:** -> - [Introduced][ce-2772] in GitLab 9.0. -> - Not available when using MySQL as external database (support removed in -> GitLab 9.3 [due to performance reasons][issue]). +[Introduced][ce-2772] in GitLab 9.0. Not available when using MySQL as external +database (support removed in GitLab 9.3 [due to performance reasons][issue]). With subgroups (aka nested groups or hierarchical groups) you can have up to 20 levels of nested groups, which among other things can help you to: @@ -80,13 +79,13 @@ structure. ## Creating a subgroup NOTE: **Note:** -> - You need to be an Owner of a group in order to be able to create -> a subgroup. For more information check the [permissions table][permissions]. -> - For a list of words that are not allowed to be used as group names see the -> [reserved names][reserved]. -> - 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. +You need to be an Owner of a group in order to be able to create a subgroup. For +more information check the [permissions table][permissions]. +For a list of words that are not allowed to be used as group names see the +[reserved names][reserved]. +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. To create a subgroup: