Commit cbb0859b authored by Amy Qualls's avatar Amy Qualls

Merge branch 'fix/doc-user-project-merge_requests-source-code' into 'master'

Doc Consistency: user/project/merge_requests - source code

See merge request gitlab-org/gitlab!78729
parents 572be06f 3eac870f
...@@ -8,7 +8,7 @@ disqus_identifier: 'https://docs.gitlab.com/ee/user/project/merge_requests/appro ...@@ -8,7 +8,7 @@ disqus_identifier: 'https://docs.gitlab.com/ee/user/project/merge_requests/appro
# Merge request approvals **(FREE)** # Merge request approvals **(FREE)**
> Redesign [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/1979) in [GitLab Premium](https://about.gitlab.com/pricing/) 11.8 and [feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/10685) in 12.0. > Redesign [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/1979) in GitLab 11.8 and [feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/10685) in 12.0.
You can configure your merge requests so that they must be approved before You can configure your merge requests so that they must be approved before
they can be merged. While [GitLab Free](https://about.gitlab.com/pricing/) allows they can be merged. While [GitLab Free](https://about.gitlab.com/pricing/) allows
...@@ -89,7 +89,7 @@ a merge request from merging without approval. ...@@ -89,7 +89,7 @@ a merge request from merging without approval.
## Required approvals **(PREMIUM)** ## Required approvals **(PREMIUM)**
> Moved to [GitLab Premium](https://about.gitlab.com/pricing/) in 13.9. > Moved to GitLab Premium in 13.9.
Required approvals enforce code reviews by the number and type of users you specify. Required approvals enforce code reviews by the number and type of users you specify.
Without the approvals, the work cannot merge. Required approvals enable multiple use cases: Without the approvals, the work cannot merge. Required approvals enable multiple use cases:
...@@ -103,7 +103,7 @@ Without the approvals, the work cannot merge. Required approvals enable multiple ...@@ -103,7 +103,7 @@ Without the approvals, the work cannot merge. Required approvals enable multiple
to determine who should review the work. to determine who should review the work.
- Require an [approval before merging code that causes test coverage to decline](../../../../ci/pipelines/settings.md#coverage-check-approval-rule) - Require an [approval before merging code that causes test coverage to decline](../../../../ci/pipelines/settings.md#coverage-check-approval-rule)
- [Require approval from a security team](../../../application_security/index.md#security-approvals-in-merge-requests) - [Require approval from a security team](../../../application_security/index.md#security-approvals-in-merge-requests)
before merging code that could introduce a vulnerability. **(ULTIMATE)** before merging code that could introduce a vulnerability.
## Related topics ## Related topics
......
...@@ -76,9 +76,9 @@ To edit a merge request approval rule: ...@@ -76,9 +76,9 @@ To edit a merge request approval rule:
select **{remove}** **Remove**. select **{remove}** **Remove**.
1. Select **Update approval rule**. 1. Select **Update approval rule**.
## Add multiple approval rules **(PREMIUM)** ## Add multiple approval rules
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/1979) in GitLab Premium 11.10. > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/1979) in GitLab 11.10.
In GitLab Premium and higher tiers, you can enforce multiple approval rules on a In GitLab Premium and higher tiers, you can enforce multiple approval rules on a
merge request, and multiple default approval rules for a project. If your tier merge request, and multiple default approval rules for a project. If your tier
...@@ -143,7 +143,7 @@ approve in these ways: ...@@ -143,7 +143,7 @@ approve in these ways:
[**Prevent committers approval**](settings.md#prevent-approvals-by-users-who-add-commits) [**Prevent committers approval**](settings.md#prevent-approvals-by-users-who-add-commits)
project setting. project setting.
### Code owners as eligible approvers **(PREMIUM)** ### Code owners as eligible approvers
> Moved to GitLab Premium in 13.9. > Moved to GitLab Premium in 13.9.
...@@ -158,9 +158,9 @@ become eligible approvers in the project. To enable this merge request approval ...@@ -158,9 +158,9 @@ become eligible approvers in the project. To enable this merge request approval
You can also You can also
[require code owner approval](../../protected_branches.md#require-code-owner-approval-on-a-protected-branch) [require code owner approval](../../protected_branches.md#require-code-owner-approval-on-a-protected-branch)
for protected branches. **(PREMIUM)** for protected branches.
## Merge request approval segregation of duties **(PREMIUM)** ## Merge request approval segregation of duties
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40491) in GitLab 13.4. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40491) in GitLab 13.4.
> - Moved to GitLab Premium in 13.9. > - Moved to GitLab Premium in 13.9.
...@@ -202,7 +202,7 @@ on a merge request, you can either add or remove approvers: ...@@ -202,7 +202,7 @@ on a merge request, you can either add or remove approvers:
Administrators can change the [merge request approvals settings](settings.md#prevent-editing-approval-rules-in-merge-requests) Administrators can change the [merge request approvals settings](settings.md#prevent-editing-approval-rules-in-merge-requests)
to prevent users from overriding approval rules for merge requests. to prevent users from overriding approval rules for merge requests.
## Configure optional approval rules **(PREMIUM)** ## Configure optional approval rules
Merge request approvals can be optional for projects where approvals are Merge request approvals can be optional for projects where approvals are
appreciated, but not required. To make an approval rule optional: appreciated, but not required. To make an approval rule optional:
...@@ -211,9 +211,9 @@ appreciated, but not required. To make an approval rule optional: ...@@ -211,9 +211,9 @@ appreciated, but not required. To make an approval rule optional:
- Use the [Merge requests approvals API](../../../../api/merge_request_approvals.md#update-merge-request-level-rule) - Use the [Merge requests approvals API](../../../../api/merge_request_approvals.md#update-merge-request-level-rule)
to set the `approvals_required` attribute to `0`. to set the `approvals_required` attribute to `0`.
## Approvals for protected branches **(PREMIUM)** ## Approvals for protected branches
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/460) in GitLab Premium 12.8. > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/460) in GitLab 12.8.
Approval rules are often relevant only to specific branches, like your Approval rules are often relevant only to specific branches, like your
[default branch](../../repository/branches/default.md). To configure an [default branch](../../repository/branches/default.md). To configure an
......
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