diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-06-05 13:12:55 +0200 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-06-05 13:12:55 +0200 |
commit | bdfd163aa1474c8fba76fb1730ee9df09f67cc69 (patch) | |
tree | b9b81d7b9ab6dfa3958682f18edf0e0053667daa /doc | |
parent | 1f78aeba40f76f6a2f6b44327367282838301a3f (diff) | |
download | gitlab-ce-bdfd163aa1474c8fba76fb1730ee9df09f67cc69.tar.gz |
Add info about WIP merge requests to docs.wip-mr-docs
Diffstat (limited to 'doc')
-rw-r--r-- | doc/workflow/README.md | 1 | ||||
-rw-r--r-- | doc/workflow/wip_merge_requests.md | 13 | ||||
-rw-r--r-- | doc/workflow/wip_merge_requests/blocked_accept_button.png | bin | 0 -> 65231 bytes | |||
-rw-r--r-- | doc/workflow/wip_merge_requests/mark_as_wip.png | bin | 0 -> 41549 bytes | |||
-rw-r--r-- | doc/workflow/wip_merge_requests/unmark_as_wip.png | bin | 0 -> 32151 bytes |
5 files changed, 14 insertions, 0 deletions
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 Binary files differnew file mode 100644 index 00000000000..4791e5de972 --- /dev/null +++ b/doc/workflow/wip_merge_requests/blocked_accept_button.png diff --git a/doc/workflow/wip_merge_requests/mark_as_wip.png b/doc/workflow/wip_merge_requests/mark_as_wip.png Binary files differnew file mode 100644 index 00000000000..8fa83a201ac --- /dev/null +++ b/doc/workflow/wip_merge_requests/mark_as_wip.png diff --git a/doc/workflow/wip_merge_requests/unmark_as_wip.png b/doc/workflow/wip_merge_requests/unmark_as_wip.png Binary files differnew file mode 100644 index 00000000000..d45e68f31c5 --- /dev/null +++ b/doc/workflow/wip_merge_requests/unmark_as_wip.png |