diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml index 906cc11dc67034b60a8442725c1784afbcf0b336..bfd4ab6f3d88db102d4148268ea8ba585117d0a6 100644 --- a/app/views/projects/merge_requests/show/_mr_accept.html.haml +++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml @@ -49,7 +49,7 @@ .automerge_widget.cannot_be_merged.hide %h4 - This pull request contains merge conflicts that must be resolved. + This merge request contains merge conflicts that must be resolved. You can try it manually on the %strong = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal" @@ -63,14 +63,14 @@ .automerge_widget.work_in_progress.hide %h4 - This request cannot be merged because it is marked as <strong>Work In Progress</strong>. + This merge request cannot be accepted because it is marked as Work In Progress. %p %button.btn.disabled{:type => 'button'} %i.fa.fa-warning Accept Merge Request - When the merge request is ready, remove the "WIP" prefix from the title to allow merging. + When the merge request is ready, remove the "WIP" prefix from the title to allow it to be accepted. .automerge_widget.unchecked %p diff --git a/doc/workflow/README.md b/doc/workflow/README.md index 89005e519583669e7bf960522d0173d185e25820..4775be1504009bc3018e6f84aa737d086c5bf162 100644 --- a/doc/workflow/README.md +++ b/doc/workflow/README.md @@ -16,3 +16,4 @@ - [Change your time zone](timezone.md) - [Keyboard shortcuts](shortcuts.md) - [Web Editor](web_editor.md) +- ["Work In Progress" Merge Requests](wip_merge_requests.md) diff --git a/doc/workflow/wip_merge_requests.md b/doc/workflow/wip_merge_requests.md new file mode 100644 index 0000000000000000000000000000000000000000..46035a5e6b68db8a623b28e7ee6c378a2694ca3c --- /dev/null +++ b/doc/workflow/wip_merge_requests.md @@ -0,0 +1,13 @@ +# "Work In Progress" Merge Requests + +To prevent merge requests from accidentally being accepted before they're completely ready, GitLab blocks the "Accept" button for merge requests that have been marked a **Work In Progress**. + + + +To mark a merge request a Work In Progress, simply start its title with `[WIP]` or `WIP:`. + + + +To allow a Work In Progress merge request to be accepted again when it's ready, simply remove the `WIP` prefix. + + diff --git a/doc/workflow/wip_merge_requests/blocked_accept_button.png b/doc/workflow/wip_merge_requests/blocked_accept_button.png new file mode 100644 index 0000000000000000000000000000000000000000..4791e5de972b56e90aaf577a2b1a58e2adb8e693 Binary files /dev/null and b/doc/workflow/wip_merge_requests/blocked_accept_button.png differ diff --git a/doc/workflow/wip_merge_requests/mark_as_wip.png b/doc/workflow/wip_merge_requests/mark_as_wip.png new file mode 100644 index 0000000000000000000000000000000000000000..8fa83a201ac8bcbfc3293b06c46302a798c1215c Binary files /dev/null and b/doc/workflow/wip_merge_requests/mark_as_wip.png differ diff --git a/doc/workflow/wip_merge_requests/unmark_as_wip.png b/doc/workflow/wip_merge_requests/unmark_as_wip.png new file mode 100644 index 0000000000000000000000000000000000000000..d45e68f31c53845eea6dd3c09e6bb6f11d05cdd0 Binary files /dev/null and b/doc/workflow/wip_merge_requests/unmark_as_wip.png differ