From 6a5ef9b75d38f39cd2a6a2392fadfbd3b966b884 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 31 Oct 2023 09:12:13 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/user/project/merge_requests/drafts.md | 35 ++++++++++++++----------------- 1 file changed, 16 insertions(+), 19 deletions(-) (limited to 'doc/user') diff --git a/doc/user/project/merge_requests/drafts.md b/doc/user/project/merge_requests/drafts.md index 85ebc75e61f..a3b1920e375 100644 --- a/doc/user/project/merge_requests/drafts.md +++ b/doc/user/project/merge_requests/drafts.md @@ -7,22 +7,19 @@ type: reference, concepts # Draft merge requests **(FREE ALL)** -If a merge request isn't ready to merge, potentially because of continued development -or open threads, you can prevent it from being accepted before you -[mark it as ready](#mark-merge-requests-as-ready). Flag it as a draft to disable -the **Merge** button until you remove the **Draft** flag: +If a merge request isn't ready to merge, you can block it from merging until you +[mark it as ready](#mark-merge-requests-as-ready). Merge requests marked as **Draft** +cannot merge until the **Draft** flag is removed, even if all other merge criteria are met: -![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 -> - [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 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. +> - [Removed](https://gitlab.com/gitlab-org/gitlab/-/issues/228685) all support for the term **WIP** in GitLab 14.8. > `/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. -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**. - **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: in a comment. To mark a merge request as ready, use `/ready`. - **Creating a commit**: Add `draft:`, `Draft:`, `fixup!`, or `Fixup!` to the 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. ## 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**. 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 [quick action](../quick_actions.md#issues-merge-requests-and-epics) 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, notifications are triggered to -[merge request participants and watchers](../../profile/notifications.md#notifications-on-issues-merge-requests-and-epics). +When you mark a merge request as ready, +[merge request participants and watchers](../../profile/notifications.md#notifications-on-issues-merge-requests-and-epics) +are notified. ## 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: 1. Go to your project and select **Code > Merge requests**. -1. In the navigation bar, select **Open**, **Merged**, **Closed**, or **All** to - filter by merge request status. +1. To filter by merge request status, select **Open**, **Merged**, **Closed**, + or **All** in the navigation bar. 1. Select the search box to display a list of filters and select **Draft**, or enter the word `draft`. 1. Select `=`. @@ -72,9 +69,9 @@ draft merge requests: ## 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).