summaryrefslogtreecommitdiff
path: root/doc/user/project
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-09-05 13:33:45 +0200
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-09-05 13:33:45 +0200
commit99e03f80ca875d261622268cf11eb63a02ae2bf5 (patch)
tree209915952582e83570546d2fa3bcb92721bb6f5e /doc/user/project
parentcbc97870bc03d987d82dac679d2a81eee54a4448 (diff)
downloadgitlab-ce-99e03f80ca875d261622268cf11eb63a02ae2bf5.tar.gz
Move `wip_merge_requests.md` to a new location
Diffstat (limited to 'doc/user/project')
-rw-r--r--doc/user/project/merge_requests/img/wip_blocked_accept_button.pngbin0 -> 32720 bytes
-rw-r--r--doc/user/project/merge_requests/img/wip_mark_as_wip.pngbin0 -> 21640 bytes
-rw-r--r--doc/user/project/merge_requests/img/wip_unmark_as_wip.pngbin0 -> 16606 bytes
-rw-r--r--doc/user/project/merge_requests/work_in_progress_merge_requests.md17
4 files changed, 17 insertions, 0 deletions
diff --git a/doc/user/project/merge_requests/img/wip_blocked_accept_button.png b/doc/user/project/merge_requests/img/wip_blocked_accept_button.png
new file mode 100644
index 00000000000..89c458aa8d9
--- /dev/null
+++ b/doc/user/project/merge_requests/img/wip_blocked_accept_button.png
Binary files differ
diff --git a/doc/user/project/merge_requests/img/wip_mark_as_wip.png b/doc/user/project/merge_requests/img/wip_mark_as_wip.png
new file mode 100644
index 00000000000..9c37354a653
--- /dev/null
+++ b/doc/user/project/merge_requests/img/wip_mark_as_wip.png
Binary files differ
diff --git a/doc/user/project/merge_requests/img/wip_unmark_as_wip.png b/doc/user/project/merge_requests/img/wip_unmark_as_wip.png
new file mode 100644
index 00000000000..31f7326beb0
--- /dev/null
+++ b/doc/user/project/merge_requests/img/wip_unmark_as_wip.png
Binary files differ
diff --git a/doc/user/project/merge_requests/work_in_progress_merge_requests.md b/doc/user/project/merge_requests/work_in_progress_merge_requests.md
new file mode 100644
index 00000000000..546c8bdc5e5
--- /dev/null
+++ b/doc/user/project/merge_requests/work_in_progress_merge_requests.md
@@ -0,0 +1,17 @@
+# "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](img/wip_blocked_accept_button.png)
+
+To mark a merge request a Work In Progress, simply start its title with `[WIP]`
+or `WIP:`.
+
+![Mark as WIP](img/wip_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](img/wip_unmark_as_wip.png)