20 KiB
stage | group | info | type |
---|---|---|---|
Create | Source Code | To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments | reference, concepts |
Merge Request Approvals (FREE)
- Introduced in GitLab Enterprise Edition 7.2. Available in GitLab Free and higher tiers.
- Redesign introduced in GitLab Premium 11.8 and feature flag removed in 12.0.
Code review is an essential practice of every successful project. Approving a merge request is an important part of the review process, as it clearly communicates the ability to merge the change.
Optional Approvals
Introduced in GitLab 13.2.
Any user with Developer or greater permissions can approve a merge request in GitLab Free and higher tiers. This provides a consistent mechanism for reviewers to approve merge requests, and ensures maintainers know a change is ready to merge. Approvals in Free are optional, and do not prevent a merge request from being merged when there is no approval.
External approvals (ULTIMATE)
- Introduced in GitLab Ultimate 13.10.
- It's deployed behind a feature flag, disabled by default.
- It's disabled on GitLab.com.
- It's not recommended for production use.
- To use it in GitLab self-managed instances, ask a GitLab administrator to enable it. (ULTIMATE SELF)
WARNING: This feature might not be available to you. Check the version history note above for details.
When you create an external approval rule, the following merge request actions sends information about a merge request to a third party service:
- Create
- Change
- Close
This action enables use-cases such as:
- Integration with 3rd party workflow tools, such as ServiceNow.
- Integration with custom tools designed to approve merge requests from outside of GitLab.
You can find more information about use-cases, development timelines and the feature discovery in the External API approval rules epic.
The intention for this feature is to allow those 3rd party tools to approve a merge request similarly to how users current do.
NOTE: The lack of an external approval does not block the merging of a merge request.
You can modify external approval rules through the REST API.
Required Approvals (PREMIUM)
- Introduced in GitLab Enterprise Edition 7.12.
- Moved to GitLab Premium in 13.9.
Required approvals enable enforced code review by requiring specified people to approve a merge request before it can be merged.
Required approvals enable multiple use cases:
- Enforcing review of all code that gets merged into a repository.
- Specifying reviewers for a given proposed code change, as well as a minimum number of reviewers, through Approval rules.
- Specifying categories of reviewers, such as backend, frontend, quality assurance, database, and so on, for all proposed code changes.
- Designating Code Owners as eligible approvers, determined by the files changed in a merge request.
- Requiring approval from a security team before merging code that could introduce a vulnerability.(ULTIMATE)
Approval Rules
Approval rules define how many approvals a merge request must receive before it can be merged, and optionally which users should do the approving. Approvals can be defined:
If no approval rules are defined, any user can approve a merge request. However, the default minimum number of required approvers can still be set in the settings for merge request approvals.
You can opt to define one single rule to approve a merge request among the available rules or choose more than one with multiple approval rules.
NOTE: On GitLab.com, you can add a group as an approver if you're a member of that group or the group is public.
Eligible Approvers
Introduced in GitLab 13.3, when an eligible approver comments on a merge request, it appears in the Commented by column of the Approvals widget.
The following users can approve merge requests:
- Users who have been added as approvers at the project or merge request levels with developer or higher permissions.
- Code owners of the files changed by the merge request that have developer or higher permissions.
An individual user can be added as an approver for a project if they are a member of:
- The project.
- The project's immediate parent group.
- A group that has access to the project via a share.
A group of users can also be added as approvers, though they only count as approvers if they have direct membership to the group. In the future, group approvers may be restricted to only groups with share access to the project.
If a user is added as an individual approver and is also part of a group approver, then that user is just counted once. The merge request author, and users who have committed to the merge request, do not count as eligible approvers, if Prevent author approval (enabled by default) and Prevent committers approval (disabled by default) are enabled on the project settings.
When an eligible approver comments on a merge request, it displays in the Commented by column of the Approvals widget. It indicates who participated in the merge request review. Authors and reviewers can also identify who they should reach out to if they have any questions about the content of the merge request.
Implicit Approvers
If the number of required approvals is greater than the number of assigned approvers, approvals from other users counts towards meeting the requirement. These would be users with developer permissions or higher in the project who were not explicitly listed in the approval rules.
Code Owners as eligible approvers
- Introduced in GitLab 11.5.
- Moved to GitLab Premium in 13.9.
If you add Code Owners to your repository, the owners to the corresponding files become eligible approvers, together with members with Developer or higher permissions.
To enable this merge request approval rule:
- Navigate to your project's Settings > General and expand Merge request approvals.
- Locate Any eligible user and choose the number of approvals required.
Once set, merge requests can only be merged once approved by the number of approvals you've set. GitLab accepts approvals from users with Developer or higher permissions, as well as by Code Owners, indistinguishably.
Alternatively, you can require Code Owner's approvals for protected branches. (PREMIUM)
Merge Request approval segregation of duties
- Introduced in GitLab 13.4.
- Moved to Premium in 13.9.
Managers or operators with Reporter permissions to a project sometimes need to be required approvers of a merge request, before a merge to a protected branch begins. These approvers aren't allowed to push or merge code to any branches.
To enable this access:
- Create a new group, and then add the user to the group, ensuring you select the Reporter role for the user.
- Share the project with your group, based on the Reporter role.
- Navigate to your project's Settings > General, and in the Merge request approvals section, click Expand.
- Select Add approval rule or Update approval rule.
- Add the group to the permission list.
Adding / editing a default approval rule
To add or edit the default merge request approval rule:
-
Navigate to your project's Settings > General and expand Merge request approvals.
-
Click Add approval rule, or Edit.
- Add or change the Rule name.
- Set the number of required approvals in Approvals required. The minimum value is
0
. - (Optional) Search for users or groups that are eligible to approve merge requests and click the Add button to add them as approvers. Before typing in the search field, approvers are suggested based on the previous authors of the files being changed by the merge request.
- (Optional) Click the {remove} Remove button next to a group or user to delete it from the rule.
-
Click Add approval rule or Update approval rule.
When approval rule overrides are allowed, changes to these default rules are not applied to existing merge requests, except for changes to the target branch of the rule.
When approval rule overrides are not allowed, all changes to these default rules are applied to existing merge requests. Any approval rules that had previously been manually overridden during a period when approval rule overrides where allowed, are not modified.
NOTE: If a merge request targets a different project, such as from a fork to the upstream project, the default approval rules are taken from the target (upstream) project, not the source (fork).
Editing / overriding approval rules per merge request
Introduced in GitLab Enterprise Edition 9.4.
By default, the merge request approval rule listed in each merge request (MR) can be edited by the MR author or a user with sufficient permissions. This ability can be disabled in the merge request approvals settings.
One possible scenario would be to add more approvers than were defined in the default settings.
When creating or editing a merge request, find the Approval rules section, then follow the same steps as Adding / editing a default approval rule.
Set up an optional approval rule
MR approvals can be configured to be optional, which can help if you're working on a team where approvals are appreciated, but not required.
To configure an approval to be optional, set the number of required approvals in Approvals required to 0
.
You can also set an optional approval rule through the Merge requests approvals API, by setting the approvals_required
attribute to 0
.
Multiple approval rules (PREMIUM)
Introduced in GitLab Premium 11.10.
In GitLab Premium, it is possible to have multiple approval rules per merge request, as well as multiple default approval rules per project.
Adding or editing multiple default rules is identical to adding or editing a single default approval rule, except the Add approval rule button is available to add more rules, even after a rule is already defined.
Similarly, editing or overriding multiple approval rules per merge request is identical to editing or overriding approval rules per merge request, except the Add approval rule button is available to add more rules, even after a rule is already defined.
When an eligible approver approves a merge request, it reduces the number of approvals left for all rules that the approver belongs to.
Scoped to protected branch (PREMIUM)
Introduced in GitLab Premium 12.8.
Approval rules are often only relevant to specific branches, like master
.
When configuring Default Approval Rules
these can be scoped to all the protected branches at once by navigating to your project's
Settings, expanding Merge request approvals, and selecting Any branch from
the Target branch dropdown.
Alternatively, you can select a very specific protected branch from the Target branch dropdown:
To enable this configuration, see Code Owner's approvals for protected branches.
Adding or removing an approval
When an eligible approver visits an open merge request, one of the following is possible:
-
If the required number of approvals has not been yet met, they can approve it by clicking the displayed Approve button.
-
If the required number of approvals has already been met, they can still approve it by clicking the displayed Approve additionally button.
-
They have already approved this merge request: They can remove their approval.
When approval rule overrides are allowed, changes to default approval rules will not be applied to existing merge requests, except for changes to the target branch of the rule.
NOTE: The merge request author is not allowed to approve their own merge request if Prevent author approval is enabled in the project settings.
After the approval rules have been met, the merge request can be merged if there is nothing else blocking it. Note that the merge request could still be blocked by other conditions, such as merge conflicts, pending discussions, or a failed CI/CD pipeline.
Approval settings
The settings for Merge request approvals are found by going to Settings > General and expanding Merge request approvals.
Prevent overriding default approvals
Regardless of the approval rules you choose for your project, users can edit them in every merge request, overriding the rules you set as default. To prevent that from happening:
- Uncheck the Allow overrides to approval lists per merge request (MR). checkbox.
- Click Save changes.
Resetting approvals on push
You can force all approvals on a merge request to be removed when new commits are pushed to the source branch of the merge request. If disabled, approvals persist even if there are changes added to the merge request. To enable this feature:
- Check the Require new approvals when new commits are added to an MR. checkbox.
- Click Save changes.
NOTE: Approvals do not get reset when rebasing a merge request from the UI. However, approvals are reset if the target branch is changed.
Allowing merge request authors to approve their own merge requests (PREMIUM)
- Introduced in GitLab 11.3.
- Moved to GitLab Premium in 13.9.
By default, projects are configured to prevent merge requests from being approved by their own authors. To change this setting:
- Go to your project's Settings > General, expand Merge request approvals.
- Uncheck the Prevent MR approval by the author. checkbox.
- Click Save changes.
Note that users can edit the approval rules in every merge request and override pre-defined settings unless it's set not to allow overrides.
You can prevent authors from approving their own merge requests at the instance level. When enabled, this setting is disabled on the project level, and not editable.
Prevent approval of merge requests by their committers (PREMIUM)
- Introduced in GitLab 11.10.
- Moved to GitLab Premium in 13.9.
You can prevent users who have committed to a merge request from approving it, though code authors can still approve. You can enable this feature at the instance level, which disables changes to this feature at the project level. If you prefer to manage this feature at the project level, you can:
- Check the Prevent MR approvals from users who make commits to the MR. checkbox. If this check box is disabled, this feature has been disabled at the instance level.
- Click Save changes.
Read the official Git documentation for an explanation of the differences between authors and committers.
Require authentication when approving a merge request
- Introduced in GitLab 12.0.
- Moved to GitLab Premium in 13.9.
NOTE: To require authentication when approving a merge request, you must enable Password authentication enabled for web interface under sign-in restrictions. in the Admin Area.
You can force the approver to enter a password in order to authenticate before adding the approval. This enables an Electronic Signature for approvals such as the one defined by CFR Part 11). To enable this feature:
- Check the Require user password for approvals. checkbox.
- Click Save changes.
Security approvals in merge requests (ULTIMATE)
Merge Request Approvals can be configured to require approval from a member of your security team when a vulnerability would be introduced by a merge request.
For more information, see Security approvals in merge requests.