diff options
| author | Marcia Ramos <marcia@gitlab.com> | 2019-08-13 14:56:21 +0300 |
|---|---|---|
| committer | Marcia Ramos <marcia@gitlab.com> | 2019-08-13 14:56:21 +0300 |
| commit | ab00677990185896fe9660b896bdb92084b4af7c (patch) | |
| tree | 22ac5d34e7512c4eb8ac02b1153f7ab42355be6e /doc/user | |
| parent | a55869483d023978655658d389aad36d63c9d2b2 (diff) | |
| parent | 9d63237942a35b552e5c782a4f1883e13027f3a4 (diff) | |
Merge branch 'pb-update-mr-approvals-docs' into 'master'
Docs: Remove info about approvals_required restriction
See merge request gitlab-org/gitlab-ce!31268
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/project/merge_requests/merge_request_approvals.md | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/doc/user/project/merge_requests/merge_request_approvals.md b/doc/user/project/merge_requests/merge_request_approvals.md index 509576c8d6f..5161b25de99 100644 --- a/doc/user/project/merge_requests/merge_request_approvals.md +++ b/doc/user/project/merge_requests/merge_request_approvals.md @@ -229,12 +229,6 @@ The default approval settings can now be overridden when creating a in the **No. approvals required** box. 1. Click **Update approvers**. -There are however some restrictions: - -- The amount of required approvals, if changed, must be greater than the default - set at the project level. This ensures that you're not forced to adjust settings - when someone is unavailable for approval, yet the process is still enforced. - NOTE: **Note:** If you are contributing to a forked project, things are a little different. Read what happens when the @@ -242,14 +236,9 @@ Read what happens when the ## Overriding merge request approvals default settings **(PREMIUM)** -In GitLab Premium, when the approval rules are [set at the project level](#editing-approvals-premium), and -**Can override approvers and approvals required per merge request** is checked, there are a few more -restrictions (compared to [GitLab Starter](#overriding-the-merge-request-approvals-default-settings)): - -- Approval rules can be added to an MR with no restriction. -- For project sourced approval rules, editing and removing approvers is not allowed. -- The approvals required of all approval rules is configurable, but if a rule is backed by a project rule, then it is restricted - to the minimum approvals required set in the project's corresponding rule. +In GitLab Premium, when the approval rules are [set at the project level](#editing-approvals-premium), +and **Can override approvers and approvals required per merge request** is checked, +approval rules can be added to an MR with no restriction. ## Resetting approvals on push |