From bdfd163aa1474c8fba76fb1730ee9df09f67cc69 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Fri, 5 Jun 2015 13:12:55 +0200 Subject: Add info about WIP merge requests to docs. --- doc/workflow/README.md | 1 + doc/workflow/wip_merge_requests.md | 13 +++++++++++++ .../wip_merge_requests/blocked_accept_button.png | Bin 0 -> 65231 bytes doc/workflow/wip_merge_requests/mark_as_wip.png | Bin 0 -> 41549 bytes doc/workflow/wip_merge_requests/unmark_as_wip.png | Bin 0 -> 32151 bytes 5 files changed, 14 insertions(+) create mode 100644 doc/workflow/wip_merge_requests.md create mode 100644 doc/workflow/wip_merge_requests/blocked_accept_button.png create mode 100644 doc/workflow/wip_merge_requests/mark_as_wip.png create mode 100644 doc/workflow/wip_merge_requests/unmark_as_wip.png (limited to 'doc') diff --git a/doc/workflow/README.md b/doc/workflow/README.md index 89005e51958..4775be15040 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 00000000000..46035a5e6b6 --- /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**. + +![Blocked Accept Button](wip_merge_requests/blocked_accept_button.png) + +To mark a merge request a Work In Progress, simply start its title with `[WIP]` or `WIP:`. + +![Mark as WIP](wip_merge_requests/mark_as_wip.png) + +To allow a Work In Progress merge request to be accepted again when it's ready, simply remove the `WIP` prefix. + +![Unark as WIP](wip_merge_requests/unmark_as_wip.png) 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 00000000000..4791e5de972 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 00000000000..8fa83a201ac 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 00000000000..d45e68f31c5 Binary files /dev/null and b/doc/workflow/wip_merge_requests/unmark_as_wip.png differ -- cgit v1.2.1