Skip to content
代码片段 群组 项目
未验证 提交 5c35246e 编辑于 作者: Amy Qualls's avatar Amy Qualls 提交者: GitLab
浏览文件

Mention closed MRs, redact old info

Simplify the opening section somewhat. Remove mentions of GitLab 13.
Add a sentence that explains MRs can't be approved after merge.
上级 0e85cc22
No related branches found
No related tags found
无相关合并请求
...@@ -17,15 +17,13 @@ flexibility: ...@@ -17,15 +17,13 @@ flexibility:
- Create required [rules](rules.md) about the number and type of approvers before work can merge. - 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](../../codeowners/index.md) for specific files, - Specify a list of users who act as [code owners](../../codeowners/index.md) for specific files,
and require their approval before work can merge. and require their approval before work can merge.
- For GitLab Premium and GitLab Ultimate, configure approvals
[for the entire instance](../../../../administration/merge_requests_approvals.md).
You can configure merge request approvals on a per-project basis, and some approvals can be configured You can configure merge request approvals on a per-project basis, and some approvals can be configured
[on the group level](../../../group/manage.md#group-merge-request-approval-settings). Support for [on the group level](../../../group/manage.md#group-merge-request-approval-settings). Support for
group-level settings for merge request approval rules is tracked in this group-level settings for merge request approval rules is tracked in this
[epic](https://gitlab.com/groups/gitlab-org/-/epics/4367). Administrators of [epic](https://gitlab.com/groups/gitlab-org/-/epics/4367).
[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](../../../../administration/merge_requests_approvals.md).
## How approvals work ## How approvals work
...@@ -48,6 +46,8 @@ You can also configure: ...@@ -48,6 +46,8 @@ You can also configure:
- Merge request approval rules and settings through the GitLab UI or with the - Merge request approval rules and settings through the GitLab UI or with the
[Merge request approvals API](../../../../api/merge_request_approvals.md). [Merge request approvals API](../../../../api/merge_request_approvals.md).
Approvals cannot be added after a merge request is merged.
## Approve a merge request ## Approve a merge request
When an [eligible approver](rules.md#eligible-approvers) visits an open merge request, When an [eligible approver](rules.md#eligible-approvers) visits an open merge request,
...@@ -60,9 +60,8 @@ GitLab displays one of these buttons after the body of the merge request: ...@@ -60,9 +60,8 @@ GitLab displays one of these buttons after the body of the merge request:
Eligible approvers can also use the `/approve` Eligible approvers can also use the `/approve`
[quick action](../../../project/quick_actions.md) when adding a comment to [quick action](../../../project/quick_actions.md) when adding a comment to
a merge request. [In GitLab 13.10 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/292936), a merge request. Users in the reviewer list who have approved a merge request display
if a user approves a merge request and is shown in the reviewer list, a green check mark a green check mark (**{check-circle-filled}**) next to their name.
(**{check-circle-filled}**) displays next to their name.
After a merge request receives the [number and type of approvals](rules.md) you configure, it can merge After a merge request receives the [number and type of approvals](rules.md) you configure, it can merge
unless it's blocked for another reason. Merge requests can be blocked by other problems, unless it's blocked for another reason. Merge requests can be blocked by other problems,
...@@ -80,8 +79,6 @@ of the rule. ...@@ -80,8 +79,6 @@ of the rule.
## Optional approvals ## Optional approvals
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/27426) in GitLab 13.2.
GitLab allows all users with Developer or greater [permissions](../../../permissions.md) GitLab allows all users with Developer or greater [permissions](../../../permissions.md)
to approve merge requests. Approvals in GitLab Free are optional, and don't prevent to approve merge requests. Approvals in GitLab Free are optional, and don't prevent
a merge request from merging without approval. a merge request from merging without approval.
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册