Commit 8618e109 authored by Evan Read's avatar Evan Read Committed by Russell Dickenson

Cross link cascade feature section and rename section

parent a9bae7b7
...@@ -9,9 +9,13 @@ type: reference, concepts ...@@ -9,9 +9,13 @@ type: reference, concepts
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/39060) in GitLab 12.8. > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/39060) in GitLab 12.8.
Merge request approval rules prevent users from overriding certain settings on the project Merge request approval rules prevent users from overriding certain settings on the project level.
level. When enabled at the instance level, these settings are no longer editable on the When enabled at the instance level, these settings [cascade](../project/merge_requests/approvals/settings.md#settings-cascading)
project level. and can no longer be changed:
- In projects.
- In groups. Cascading to groups was [enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/285410)
in GitLab 14.5.
To enable merge request approval settings for an instance: To enable merge request approval settings for an instance:
...@@ -24,15 +28,14 @@ To enable merge request approval settings for an instance: ...@@ -24,15 +28,14 @@ To enable merge request approval settings for an instance:
Merge request approval settings that can be set at an instance level are: Merge request approval settings that can be set at an instance level are:
- **Prevent approval by author**. Prevents project - **Prevent approval by author**. Prevents project maintainers from allowing request authors to
maintainers from allowing request authors to merge their own merge requests. merge their own merge requests.
- **Prevent approvals by users who add commits**. Prevents project - **Prevent approvals by users who add commits**. Prevents project maintainers from allowing users
maintainers from allowing users to approve merge requests if they have submitted to approve merge requests if they have submitted any commits to the source branch.
any commits to the source branch. - **Prevent editing approval rules in projects and merge requests**. Prevents users from modifying
- **Prevent editing approval rules in projects and merge requests**. Prevents users from the approvers list in project settings or in individual merge requests.
modifying the approvers list in project settings or in individual merge requests.
See also the following, 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). - [Project 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. - [Group merge request approval rules](../group/index.md#group-approval-rules) available in GitLab 13.9 and later.
...@@ -742,12 +742,11 @@ The group's new subgroups have push rules set for them based on either: ...@@ -742,12 +742,11 @@ The group's new subgroups have push rules set for them based on either:
FLAG: FLAG:
On self-managed GitLab, by default this feature is available. To hide the feature per group, ask an administrator to [disable the feature flag](../../administration/feature_flags.md) named `group_merge_request_approval_settings_feature_flag`. On GitLab.com, this feature is available. On self-managed GitLab, by default this feature is available. To hide the feature per group, ask an administrator to [disable the feature flag](../../administration/feature_flags.md) named `group_merge_request_approval_settings_feature_flag`. On GitLab.com, this feature is available.
Group approval rules provides an interface for managing Group approval rules manage [project merge request approval rules](../project/merge_requests/approvals/index.md)
[project merge request approval rules](../project/merge_requests/approvals/index.md) at the at the top-level group level. These rules [cascade to all projects](../project/merge_requests/approvals/settings.md#settings-cascading)
top-level group level. When rules are configured [at the instance level](../admin_area/merge_requests_approvals.md), that belong to the group.
you can't edit locked rules.
To view the merge request approval rules UI for a group: To view the merge request approval rules for a group:
1. Go to the top-level group's **Settings > General** page. 1. Go to the top-level group's **Settings > General** page.
1. Expand the **Merge request approvals** section. 1. Expand the **Merge request approvals** section.
......
...@@ -139,7 +139,7 @@ coverage. ...@@ -139,7 +139,7 @@ coverage.
To learn more, see [Coverage check approval rule](../../../../ci/pipelines/settings.md#coverage-check-approval-rule). To learn more, see [Coverage check approval rule](../../../../ci/pipelines/settings.md#coverage-check-approval-rule).
## Merge request approval settings cascading ## Settings cascading
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/285410) in GitLab 14.4. [Deployed behind the `group_merge_request_approval_settings_feature_flag` flag](../../../../administration/feature_flags.md), disabled by default. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/285410) in GitLab 14.4. [Deployed behind the `group_merge_request_approval_settings_feature_flag` flag](../../../../administration/feature_flags.md), disabled by default.
> - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/285410) in GitLab 14.5. > - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/285410) in GitLab 14.5.
...@@ -149,11 +149,13 @@ On self-managed GitLab, by default this feature is available. To hide the featur ...@@ -149,11 +149,13 @@ On self-managed GitLab, by default this feature is available. To hide the featur
You can also enforce merge request approval settings: 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 - At the [instance level](../../../admin_area/merge_requests_approvals.md), which apply to all groups
projects. 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. - 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 changed in the group or project
that inherited them.
## Related links ## Related links
......
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