summaryrefslogtreecommitdiff
path: root/doc/workflow
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/workflow
parentcbc97870bc03d987d82dac679d2a81eee54a4448 (diff)
downloadgitlab-ce-99e03f80ca875d261622268cf11eb63a02ae2bf5.tar.gz
Move `wip_merge_requests.md` to a new location
Diffstat (limited to 'doc/workflow')
-rw-r--r--doc/workflow/wip_merge_requests.md14
-rw-r--r--doc/workflow/wip_merge_requests/blocked_accept_button.pngbin32720 -> 0 bytes
-rw-r--r--doc/workflow/wip_merge_requests/mark_as_wip.pngbin21640 -> 0 bytes
-rw-r--r--doc/workflow/wip_merge_requests/unmark_as_wip.pngbin16606 -> 0 bytes
4 files changed, 1 insertions, 13 deletions
diff --git a/doc/workflow/wip_merge_requests.md b/doc/workflow/wip_merge_requests.md
index 46035a5e6b6..abb8002f442 100644
--- a/doc/workflow/wip_merge_requests.md
+++ b/doc/workflow/wip_merge_requests.md
@@ -1,13 +1 @@
-# "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)
+This document was moved to [user/project/merge_requests/work_in_progress_merge_requests](../user/project/merge_requests/work_in_progress_merge_requests.md).
diff --git a/doc/workflow/wip_merge_requests/blocked_accept_button.png b/doc/workflow/wip_merge_requests/blocked_accept_button.png
deleted file mode 100644
index 89c458aa8d9..00000000000
--- a/doc/workflow/wip_merge_requests/blocked_accept_button.png
+++ /dev/null
Binary files differ
diff --git a/doc/workflow/wip_merge_requests/mark_as_wip.png b/doc/workflow/wip_merge_requests/mark_as_wip.png
deleted file mode 100644
index 9c37354a653..00000000000
--- a/doc/workflow/wip_merge_requests/mark_as_wip.png
+++ /dev/null
Binary files differ
diff --git a/doc/workflow/wip_merge_requests/unmark_as_wip.png b/doc/workflow/wip_merge_requests/unmark_as_wip.png
deleted file mode 100644
index 31f7326beb0..00000000000
--- a/doc/workflow/wip_merge_requests/unmark_as_wip.png
+++ /dev/null
Binary files differ