From c268ead08dd754d7148bb115abb5cd2605911db6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Dupr=C3=A9?= <odupre@gitlab.com> Date: Fri, 2 Aug 2024 15:08:11 +0000 Subject: [PATCH 1/5] Suggested improvement on Protecting environments documentation. --- doc/ci/environments/protected_environments.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/ci/environments/protected_environments.md b/doc/ci/environments/protected_environments.md index 1d69f464fa521d67..a6122624128560c2 100644 --- a/doc/ci/environments/protected_environments.md +++ b/doc/ci/environments/protected_environments.md @@ -30,8 +30,11 @@ Maintainer role. Prerequisites: -- When granting the **Allowed to deploy** permission to a group or subgroup, the user configuring the protected environment must be a **direct member** of the group or subgroup to be added. Otherwise, the group or subgroup does not show up in the dropdown list. For more information see [issue #345140](https://gitlab.com/gitlab-org/gitlab/-/issues/345140). -- When granting **Allowed to deploy** permissions to a group or project by using the settings UI, only direct members of the group or project receive these permissions. To grant these permissions to inherited members also, [use the API](../../api/protected_environments.md#group-inheritance-types). For more information see [issue #422392](https://gitlab.com/gitlab-org/gitlab/-/issues/422392). +- When granting the **Allowed to deploy** permission to an approver group, the user configuring the protected environment must be a **direct member** of the approver group to be added. Otherwise, the group or subgroup does not show up in the dropdown list. For more information see [issue #345140](https://gitlab.com/gitlab-org/gitlab/-/issues/345140). +- When granting **Allowed to deploy** permissions to an approver group by using the settings UI, only direct members of the approver group or project receive these permissions. To also grant these permissions to members of the approver group inherited from their upper hierarchy: + - check the **Enable group inheritance** checkbox. + - [use the API](../../api/protected_environments.md#group-inheritance-types). +For more information see [issue #422392](https://gitlab.com/gitlab-org/gitlab/-/issues/422392). To protect an environment: -- GitLab From 0da32724d5afd55e17d8f4b8cd636155d3e9a0a8 Mon Sep 17 00:00:00 2001 From: "Viktor Nagy (GitLab)" <vnagy@gitlab.com> Date: Mon, 5 Aug 2024 12:06:51 +0000 Subject: [PATCH 2/5] Apply 1 suggestion(s) to 1 file(s) --- doc/ci/environments/protected_environments.md | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/ci/environments/protected_environments.md b/doc/ci/environments/protected_environments.md index a6122624128560c2..10fe2fe970b47d68 100644 --- a/doc/ci/environments/protected_environments.md +++ b/doc/ci/environments/protected_environments.md @@ -34,7 +34,6 @@ Prerequisites: - When granting **Allowed to deploy** permissions to an approver group by using the settings UI, only direct members of the approver group or project receive these permissions. To also grant these permissions to members of the approver group inherited from their upper hierarchy: - check the **Enable group inheritance** checkbox. - [use the API](../../api/protected_environments.md#group-inheritance-types). -For more information see [issue #422392](https://gitlab.com/gitlab-org/gitlab/-/issues/422392). To protect an environment: -- GitLab From 5bc6a76a26aaf94b84efbd7f5240cf57e134dbb4 Mon Sep 17 00:00:00 2001 From: "Viktor Nagy (GitLab)" <vnagy@gitlab.com> Date: Mon, 5 Aug 2024 12:13:21 +0000 Subject: [PATCH 3/5] Apply 2 suggestion(s) to 1 file(s) Co-authored-by: Phillip Wells <pwells@gitlab.com> --- doc/ci/environments/protected_environments.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/ci/environments/protected_environments.md b/doc/ci/environments/protected_environments.md index 10fe2fe970b47d68..a5b5ce9cdac75efb 100644 --- a/doc/ci/environments/protected_environments.md +++ b/doc/ci/environments/protected_environments.md @@ -31,8 +31,8 @@ Maintainer role. Prerequisites: - When granting the **Allowed to deploy** permission to an approver group, the user configuring the protected environment must be a **direct member** of the approver group to be added. Otherwise, the group or subgroup does not show up in the dropdown list. For more information see [issue #345140](https://gitlab.com/gitlab-org/gitlab/-/issues/345140). -- When granting **Allowed to deploy** permissions to an approver group by using the settings UI, only direct members of the approver group or project receive these permissions. To also grant these permissions to members of the approver group inherited from their upper hierarchy: - - check the **Enable group inheritance** checkbox. +- When granting **Allowed to deploy** permissions to an approver group or project, by default only direct members of the approver group or project receive these permissions. To also grant these permissions to inherited members of the approver group or project: + - Check the **Enable group inheritance** checkbox. - [use the API](../../api/protected_environments.md#group-inheritance-types). To protect an environment: -- GitLab From 44387998c836c2029593649962f5f14f8679be63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Dupr=C3=A9?= <odupre@gitlab.com> Date: Mon, 5 Aug 2024 15:03:12 +0000 Subject: [PATCH 4/5] Changed second bullet point from "Allowed to deploy" to "Approvers" --- doc/ci/environments/protected_environments.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ci/environments/protected_environments.md b/doc/ci/environments/protected_environments.md index a5b5ce9cdac75efb..489ba9dc7d191de9 100644 --- a/doc/ci/environments/protected_environments.md +++ b/doc/ci/environments/protected_environments.md @@ -31,7 +31,7 @@ Maintainer role. Prerequisites: - When granting the **Allowed to deploy** permission to an approver group, the user configuring the protected environment must be a **direct member** of the approver group to be added. Otherwise, the group or subgroup does not show up in the dropdown list. For more information see [issue #345140](https://gitlab.com/gitlab-org/gitlab/-/issues/345140). -- When granting **Allowed to deploy** permissions to an approver group or project, by default only direct members of the approver group or project receive these permissions. To also grant these permissions to inherited members of the approver group or project: +- When granting **Approvers** permissions to an approver group or project, by default only direct members of the approver group or project receive these permissions. To also grant these permissions to inherited members of the approver group or project: - Check the **Enable group inheritance** checkbox. - [use the API](../../api/protected_environments.md#group-inheritance-types). -- GitLab From 0ab84715d37f489a4773640ed44146333a1d0337 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Dupr=C3=A9?= <odupre@gitlab.com> Date: Tue, 6 Aug 2024 10:28:57 +0000 Subject: [PATCH 5/5] Select a checkbox, not check it. --- doc/ci/environments/protected_environments.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/ci/environments/protected_environments.md b/doc/ci/environments/protected_environments.md index 489ba9dc7d191de9..3cb4e389577215d3 100644 --- a/doc/ci/environments/protected_environments.md +++ b/doc/ci/environments/protected_environments.md @@ -32,8 +32,8 @@ Prerequisites: - When granting the **Allowed to deploy** permission to an approver group, the user configuring the protected environment must be a **direct member** of the approver group to be added. Otherwise, the group or subgroup does not show up in the dropdown list. For more information see [issue #345140](https://gitlab.com/gitlab-org/gitlab/-/issues/345140). - When granting **Approvers** permissions to an approver group or project, by default only direct members of the approver group or project receive these permissions. To also grant these permissions to inherited members of the approver group or project: - - Check the **Enable group inheritance** checkbox. - - [use the API](../../api/protected_environments.md#group-inheritance-types). + - Select the **Enable group inheritance** checkbox. + - [Use the API](../../api/protected_environments.md#group-inheritance-types). To protect an environment: -- GitLab