Commit c588ebae authored by Russell Dickenson's avatar Russell Dickenson

Merge branch 'docs-aqualls-code-review-badge' into 'master'

Revise tiers on rules page

See merge request gitlab-org/gitlab!65091
parents 3a3b0c7b a4a4fa77
...@@ -11,11 +11,21 @@ disqus_identifier: 'https://docs.gitlab.com/ee/user/project/merge_requests/merge ...@@ -11,11 +11,21 @@ disqus_identifier: 'https://docs.gitlab.com/ee/user/project/merge_requests/merge
> 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 Premium](https://about.gitlab.com/pricing/) 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. You can do this by creating [rules](rules.md) or by specifying they can be merged. While [GitLab Free](https://about.gitlab.com/pricing/) allows
a list of users who act as [code owners](../../code_owners.md) for specific files. all users with Developer or greater [permissions](../../../permissions.md) to
approve merge requests, these approvals are [optional](#optional-approvals).
You can configure merge request approvals for each project. In higher GitLab tiers, [GitLab Premium](https://about.gitlab.com/pricing/) and
Administrators of self-managed GitLab instances can configure approvals [GitLab Ultimate](https://about.gitlab.com/pricing/) provide additional
flexibility:
- Create required [rules](rules.md) about the number and type of approvers before work can merge.
- Specify a list of users who act as [code owners](../../code_owners.md) for specific files,
and require their approval before work can merge.
You can configure merge request approvals on a per-project basis. Administrators of
[GitLab Premium](https://about.gitlab.com/pricing/) and
[GitLab Ultimate](https://about.gitlab.com/pricing/) self-managed GitLab instances
can also configure approvals
[for the entire instance](../../../admin_area/merge_requests_approvals.md). [for the entire instance](../../../admin_area/merge_requests_approvals.md).
## How approvals work ## How approvals work
......
...@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated ...@@ -5,7 +5,7 @@ info: "To determine the technical writer assigned to the Stage/Group associated
type: reference, concepts type: reference, concepts
--- ---
# Merge request approval rules **(FREE)** # Merge request approval rules **(PREMIUM)**
Approval rules define how many [approvals](index.md) a merge request must receive before it can Approval rules define how many [approvals](index.md) a merge request must receive before it can
be merged, and which users should do the approving. You can define approval rules: be merged, and which users should do the approving. You can define approval rules:
...@@ -203,7 +203,7 @@ on a merge request, you can either add or remove approvers: ...@@ -203,7 +203,7 @@ on a merge request, you can either add or remove approvers:
Administrators can change the [merge request approvals settings](settings.md#prevent-overrides-of-default-approvals) Administrators can change the [merge request approvals settings](settings.md#prevent-overrides-of-default-approvals)
to prevent users from overriding approval rules for merge requests. to prevent users from overriding approval rules for merge requests.
## Configure optional approval rules ## Configure optional approval rules **(PREMIUM)**
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:
......
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