summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-11-13 19:27:03 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-11-13 19:27:03 +0000
commit7f5f940041c8d1ee074be96cc64bdccdd95649b1 (patch)
tree334342b5d7c1898efcbe345c51838b63aa5106bc /doc
parentb16db1458f5e0f6b0427cf3e2471302657297427 (diff)
downloadgitlab-ce-7f5f940041c8d1ee074be96cc64bdccdd95649b1.tar.gz
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.4
Diffstat (limited to 'doc')
-rw-r--r--doc/user/admin_area/merge_requests_approvals.md42
1 files changed, 10 insertions, 32 deletions
diff --git a/doc/user/admin_area/merge_requests_approvals.md b/doc/user/admin_area/merge_requests_approvals.md
index 8f51c03e105..fb9ca21a214 100644
--- a/doc/user/admin_area/merge_requests_approvals.md
+++ b/doc/user/admin_area/merge_requests_approvals.md
@@ -5,51 +5,29 @@ info: To determine the technical writer assigned to the Stage/Group associated w
type: reference, concepts
---
-# Instance-level merge request approval rules **(PREMIUM ONLY)**
+# Merge request approval rules **(PREMIUM ONLY)**
> Introduced in [GitLab Premium](https://gitlab.com/gitlab-org/gitlab/-/issues/39060) 12.8.
-Merge request approvals rules prevent users overriding certain settings on a project
-level. When configured, only administrators can change these settings on a project level
-if they are enabled at an instance level.
+Merge request approval rules prevent users from overriding certain settings on the project
+level. When enabled at the instance level, these settings are no longer editable on the
+project level.
To enable merge request approval rules for an instance:
1. Navigate to **Admin Area >** **{push-rules}** **Push Rules** and expand **Merge
- requests approvals**.
+requests approvals**.
1. Set the required rule.
1. Click **Save changes**.
-GitLab administrators can later override these settings in a project’s settings.
-
## Available rules
Merge request approval rules that can be set at an instance level are:
- **Prevent approval of merge requests by merge request author**. Prevents project
- maintainers from allowing request authors to merge their own merge requests.
+maintainers from allowing request authors to merge their own merge requests.
- **Prevent approval of merge requests by merge request committers**. Prevents project
- maintainers from allowing users to approve merge requests if they have submitted
- any commits to the source branch.
-- **Prevent users from modifying merge request approvers list**. Prevents project
- maintainers from allowing users to modify the approvers list in project settings
- or in individual merge requests.
-
-## Scope rules to compliance-labeled projects
-
-> Introduced in [GitLab Premium](https://gitlab.com/groups/gitlab-org/-/epics/3432) 13.2.
-
-Merge request approval rules can be further scoped to specific compliance frameworks.
-
-When the compliance framework label is selected and the project is assigned the compliance
-label, the instance-level MR approval settings will take effect and the
-[project-level settings](../project/merge_requests/merge_request_approvals.md#adding--editing-a-default-approval-rule)
-is locked for modification.
-
-When the compliance framework label is not selected or the project is not assigned the
-compliance label, the project-level MR approval settings will take effect and the users with
-Maintainer role and above can modify these.
-
-| Instance-level | Project-level |
-| -------------- | ------------- |
-| ![Scope MR approval settings to compliance frameworks](img/scope_mr_approval_settings_v13_1.png) | ![MR approval settings on compliance projects](img/mr_approval_settings_compliance_project_v13_1.png) |
+maintainers from allowing users to approve merge requests if they have submitted
+any commits to the source branch.
+- **Prevent users from modifying merge request approvers list**. Prevents users from
+modifying the approvers list in project settings or in individual merge requests.