Commit 592b4fc5 authored by Marcin Sedlak-Jakubowski's avatar Marcin Sedlak-Jakubowski Committed by Amy Qualls

Edit unclear badging in docs

parent 27c91e4f
...@@ -31,7 +31,7 @@ If you need the value of these fields from this endpoint, set the `with_merge_st ...@@ -31,7 +31,7 @@ If you need the value of these fields from this endpoint, set the `with_merge_st
`true` in the query. `true` in the query.
- `references.relative` is relative to the group or project that the merge request is being requested. When the merge request - `references.relative` is relative to the group or project that the merge request is being requested. When the merge request
is fetched from its project, `relative` format would be the same as `short` format, and when requested across groups or projects, it is expected to be the same as `full` format. is fetched from its project, `relative` format would be the same as `short` format, and when requested across groups or projects, it is expected to be the same as `full` format.
- If `approvals_before_merge` **(STARTER)** is not provided, it inherits the value from the target project. If provided, the following conditions must hold for it to take effect: - If `approvals_before_merge` is not provided, it inherits the value from the target project. If provided, the following conditions must hold for it to take effect:
- The target project's `approvals_before_merge` must be greater than zero. A - The target project's `approvals_before_merge` must be greater than zero. A
value of zero disables approvals for that project. value of zero disables approvals for that project.
......
...@@ -4,7 +4,7 @@ group: Source Code ...@@ -4,7 +4,7 @@ group: Source Code
info: 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 info: 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
--- ---
# Approval Rules development guide # Approval Rules development guide **(STARTER)**
This document explains the backend design and flow of all related functionality This document explains the backend design and flow of all related functionality
about [merge request approval rules](../user/project/merge_requests/merge_request_approvals.md). about [merge request approval rules](../user/project/merge_requests/merge_request_approvals.md).
......
...@@ -53,7 +53,7 @@ When you start a new merge request, you can immediately include the following ...@@ -53,7 +53,7 @@ When you start a new merge request, you can immediately include the following
options, or add them later by clicking the **Edit** button on the merge options, or add them later by clicking the **Edit** button on the merge
request's page at the top-right side: request's page at the top-right side:
- [Assign](#assignee) the merge request to a colleague for review. With GitLab Starter and higher tiers, you can [assign it to more than one person at a time](#multiple-assignees). - [Assign](#assignee) the merge request to a colleague for review. With [multiple assignees](#multiple-assignees), you can assign it to more than one person at a time.
- Set a [milestone](../milestones/index.md) to track time-sensitive changes. - Set a [milestone](../milestones/index.md) to track time-sensitive changes.
- Add [labels](../labels.md) to help contextualize and filter your merge requests over time. - Add [labels](../labels.md) to help contextualize and filter your merge requests over time.
- Require [approval](merge_request_approvals.md) from your team. **(STARTER)** - Require [approval](merge_request_approvals.md) from your team. **(STARTER)**
......
...@@ -25,7 +25,7 @@ not prevent a merge request from being merged when there is no approval. ...@@ -25,7 +25,7 @@ not prevent a merge request from being merged when there is no approval.
## Required Approvals **(STARTER)** ## Required Approvals **(STARTER)**
> [Introduced](https://about.gitlab.com/releases/2015/06/22/gitlab-7-12-released/#merge-request-approvers-ee-only) in GitLab Enterprise Edition 7.12. Available in [GitLab Starter](https://about.gitlab.com/pricing/) and higher tiers. > [Introduced](https://about.gitlab.com/releases/2015/06/22/gitlab-7-12-released/#merge-request-approvers-ee-only) in GitLab Enterprise Edition 7.12.
Required approvals enable enforced code review by requiring specified people Required approvals enable enforced code review by requiring specified people
to approve a merge request before it can be merged. to approve a merge request before it can be merged.
...@@ -54,9 +54,7 @@ If no approval rules are defined, any user can approve a merge request, though t ...@@ -54,9 +54,7 @@ If no approval rules are defined, any user can approve a merge request, though t
minimum number of required approvers can still be set in the [project settings for merge request approvals](#merge-request-approvals-project-settings). minimum number of required approvers can still be set in the [project settings for merge request approvals](#merge-request-approvals-project-settings).
You can opt to define one single rule to approve a merge request among the available rules You can opt to define one single rule to approve a merge request among the available rules
or choose more than one. Single approval rules are available in GitLab Starter and higher tiers, or choose more than one with [multiple approval rules](#multiple-approval-rules).
while [multiple approval rules](#multiple-approval-rules) are available in
[GitLab Premium](https://about.gitlab.com/pricing/) and above.
NOTE: NOTE:
On GitLab.com, you can add a group as an approver if you're a member of that group or the On GitLab.com, you can add a group as an approver if you're a member of that group or the
......
...@@ -128,7 +128,7 @@ Set up your project's merge request settings: ...@@ -128,7 +128,7 @@ Set up your project's merge request settings:
![project's merge request settings](img/merge_requests_settings.png) ![project's merge request settings](img/merge_requests_settings.png)
### Service Desk **(STARTER)** ### Service Desk
Enable [Service Desk](../service_desk.md) for your project to offer customer support. Enable [Service Desk](../service_desk.md) for your project to offer customer support.
......
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