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

Fix Vale issues, drop reading level

Take out some old version info. Address some other Vale issues, and
simplify some sentences to drop the reading level.
上级 9d9aa1a0
No related branches found
No related tags found
无相关合并请求
...@@ -7,22 +7,19 @@ type: reference, concepts ...@@ -7,22 +7,19 @@ type: reference, concepts
# Draft merge requests **(FREE ALL)** # Draft merge requests **(FREE ALL)**
If a merge request isn't ready to merge, potentially because of continued development If a merge request isn't ready to merge, you can block it from merging until you
or open threads, you can prevent it from being accepted before you [mark it as ready](#mark-merge-requests-as-ready). Merge requests marked as **Draft**
[mark it as ready](#mark-merge-requests-as-ready). Flag it as a draft to disable cannot merge until the **Draft** flag is removed, even if all other merge criteria are met:
the **Merge** button until you remove the **Draft** flag:
![Blocked Merge Button](img/merge_request_draft_blocked_v16_0.png) ![merge is blocked](img/merge_request_draft_blocked_v16_0.png)
## Mark merge requests as drafts ## Mark merge requests as drafts
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/32692) in GitLab 13.2, Work-In-Progress (WIP) merge requests were renamed to **Draft**. > - [Removed](https://gitlab.com/gitlab-org/gitlab/-/issues/228685) all support for the term **WIP** in GitLab 14.8.
> - [Removed](https://gitlab.com/gitlab-org/gitlab/-/issues/228685) all support for using **WIP** in GitLab 14.8.
> - **Mark as draft** and **Mark as ready** buttons [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/227421) in GitLab 13.5.
> `/draft` quick action as a toggle [deprecated](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92654) in GitLab 15.4. > `/draft` quick action as a toggle [deprecated](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92654) in GitLab 15.4.
> - [Changed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108073) the draft status to use a checkbox in GitLab 15.8. > - [Changed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108073) the draft status to use a checkbox in GitLab 15.8.
There are several ways to flag a merge request as a draft: You can flag a merge request as a draft in several ways:
- **Viewing a merge request**: In the upper-right corner of the merge request, select **Mark as draft**. - **Viewing a merge request**: In the upper-right corner of the merge request, select **Mark as draft**.
- **Creating or editing a merge request**: Add `[Draft]`, `Draft:` or `(Draft)` to - **Creating or editing a merge request**: Add `[Draft]`, `Draft:` or `(Draft)` to
...@@ -33,12 +30,12 @@ There are several ways to flag a merge request as a draft: ...@@ -33,12 +30,12 @@ There are several ways to flag a merge request as a draft:
in a comment. To mark a merge request as ready, use `/ready`. in a comment. To mark a merge request as ready, use `/ready`.
- **Creating a commit**: Add `draft:`, `Draft:`, `fixup!`, or `Fixup!` to the - **Creating a commit**: Add `draft:`, `Draft:`, `fixup!`, or `Fixup!` to the
beginning of a commit message targeting the merge request's source branch. This beginning of a commit message targeting the merge request's source branch. This
is not a toggle, and adding this text again in a later commit doesn't mark the method is not a toggle. Adding this text again in a later commit doesn't mark the
merge request as ready. merge request as ready.
## Mark merge requests as ready ## Mark merge requests as ready
When a merge request is ready to be merged, you can remove the `Draft` flag in several ways: When a merge request is ready to merge, you can remove the `Draft` flag in several ways:
- **Viewing a merge request**: In the upper-right corner of the merge request, select **Mark as ready**. - **Viewing a merge request**: In the upper-right corner of the merge request, select **Mark as ready**.
Users with at least the Developer role Users with at least the Developer role
...@@ -50,18 +47,18 @@ When a merge request is ready to be merged, you can remove the `Draft` flag in s ...@@ -50,18 +47,18 @@ When a merge request is ready to be merged, you can remove the `Draft` flag in s
[quick action](../quick_actions.md#issues-merge-requests-and-epics) [quick action](../quick_actions.md#issues-merge-requests-and-epics)
in a comment in the merge request. in a comment in the merge request.
In [GitLab 13.10 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/15332), When you mark a merge request as ready,
when you mark a merge request as ready, notifications are triggered to [merge request participants and watchers](../../profile/notifications.md#notifications-on-issues-merge-requests-and-epics)
[merge request participants and watchers](../../profile/notifications.md#notifications-on-issues-merge-requests-and-epics). are notified.
## Include or exclude drafts when searching ## Include or exclude drafts when searching
When viewing or searching in your project's merge requests list, you can include or exclude When you view or search in your project's merge requests list, to include or exclude
draft merge requests: draft merge requests:
1. Go to your project and select **Code > Merge requests**. 1. Go to your project and select **Code > Merge requests**.
1. In the navigation bar, select **Open**, **Merged**, **Closed**, or **All** to 1. To filter by merge request status, select **Open**, **Merged**, **Closed**,
filter by merge request status. or **All** in the navigation bar.
1. Select the search box to display a list of filters and select **Draft**, or 1. Select the search box to display a list of filters and select **Draft**, or
enter the word `draft`. enter the word `draft`.
1. Select `=`. 1. Select `=`.
...@@ -72,9 +69,9 @@ draft merge requests: ...@@ -72,9 +69,9 @@ draft merge requests:
## Pipelines for drafts ## Pipelines for drafts
Draft merge requests run the same pipelines as merge request that are marked as ready. Draft merge requests run the same pipelines as merge requests marked as ready.
In GitLab 15.0 and older, you must [mark the merge request as ready](#mark-merge-requests-as-ready) In GitLab 15.0 and earlier, you must [mark the merge request as ready](#mark-merge-requests-as-ready)
if you want to run [merged results pipelines](../../../ci/pipelines/merged_results_pipelines.md). if you want to run [merged results pipelines](../../../ci/pipelines/merged_results_pipelines.md).
<!-- ## Troubleshooting <!-- ## Troubleshooting
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册