Commit f21f76b8 authored by Evan Read's avatar Evan Read

Merge branch 'jlouw-cross-link-between-approval-rule-docs' into 'master'

Update merge request approval rule docs

See merge request gitlab-org/gitlab!71991
parents d90bdf6f 860de2dd
...@@ -32,4 +32,7 @@ any commits to the source branch. ...@@ -32,4 +32,7 @@ any commits to the source branch.
- **Prevent editing approval rules in projects and merge requests**. Prevents users from - **Prevent editing approval rules in projects and merge requests**. Prevents users from
modifying the approvers list in project settings or in individual merge requests. modifying the approvers list in project settings or in individual merge requests.
Also read the [project level merge request approval rules](../project/merge_requests/approvals/index.md), which are affected by instance level rules. See also the following, which are affected by instance-level rules:
- [Project-level merge request approval rules](../project/merge_requests/approvals/index.md).
- [Group-level merge request approval rules](../group/index.md#group-approval-rules) available in GitLab 13.9 and later.
...@@ -732,7 +732,7 @@ The group's new subgroups have push rules set for them based on either: ...@@ -732,7 +732,7 @@ The group's new subgroups have push rules set for them based on either:
- The closest parent group with push rules defined. - The closest parent group with push rules defined.
- Push rules set at the instance level, if no parent groups have push rules defined. - Push rules set at the instance level, if no parent groups have push rules defined.
## Group approval rules **(ULTIMATE)** ## Group approval rules **(PREMIUM)**
> Introduced in GitLab 13.9. [Deployed behind the `group_merge_request_approval_settings_feature_flag` flag](../../administration/feature_flags.md), disabled by default. > Introduced in GitLab 13.9. [Deployed behind the `group_merge_request_approval_settings_feature_flag` flag](../../administration/feature_flags.md), disabled by default.
...@@ -743,12 +743,8 @@ The feature is not ready for production use. ...@@ -743,12 +743,8 @@ The feature is not ready for production use.
Group approval rules are an in-development feature that provides an interface for managing Group approval rules are an in-development feature that provides an interface for managing
[project merge request approval rules](../project/merge_requests/approvals/index.md) at the [project merge request approval rules](../project/merge_requests/approvals/index.md) at the
top-level group level. top-level group level. When rules are configured [at the instance level](../admin_area/merge_requests_approvals.md),
you can't edit locked rules.
The feature is limited to the user interface but the following merge requests extend the UI to:
- [Enforce group settings on projects](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69750).
- [Cascade group settings onto projects](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68476).
To view the merge request approval rules UI for a group: To view the merge request approval rules UI for a group:
......
...@@ -141,7 +141,11 @@ FLAG: ...@@ -141,7 +141,11 @@ FLAG:
On self-managed GitLab, by default this feature is not available. To make it available per group, ask an administrator to [enable the `group_merge_request_approval_settings_feature_flag` flag](../../../../administration/feature_flags.md). On GitLab.com, this feature is not available. On self-managed GitLab, by default this feature is not available. To make it available per group, ask an administrator to [enable the `group_merge_request_approval_settings_feature_flag` flag](../../../../administration/feature_flags.md). On GitLab.com, this feature is not available.
You should not use this feature for production environments You should not use this feature for production environments
You can now enforce merge request approval settings at an instance level which will apply to all groups on an instance and, by extension, all projects. It is also possible to enforce merge request approval settings on an individual root group which will apply to all subgroups and projects. You can also enforce merge request approval settings:
- At the [instance level](../../../admin_area/merge_requests_approvals.md), which apply to all groups on an instance and, therefore, all
projects.
- On a [top-level group](../../../group/index.md#group-approval-rules), which apply to all subgroups and projects.
If the settings are inherited by a group or project, they cannot be overridden by the group or project that inherited them. If the settings are inherited by a group or project, they cannot be overridden by the group or project that inherited them.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment