Commit 6f7bf4e4 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'wip-mr-docs' into 'master'

Add info about WIP merge requests to docs.

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2078.

See merge request !770
parents 3b9792ec bdfd163a
......@@ -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
&nbsp;
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
......
......@@ -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)
# "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)
doc/workflow/wip_merge_requests/blocked_accept_button.png

63.7 KB

doc/workflow/wip_merge_requests/mark_as_wip.png

40.6 KB

doc/workflow/wip_merge_requests/unmark_as_wip.png

31.4 KB

Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment