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 /app/views | |
| parent | 1f78aeba40f76f6a2f6b44327367282838301a3f (diff) | |
| download | gitlab-ce-wip-mr-docs.tar.gz | |
Add info about WIP merge requests to docs.wip-mr-docs
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_accept.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml index 906cc11dc67..bfd4ab6f3d8 100644 --- a/app/views/projects/merge_requests/show/_mr_accept.html.haml +++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml @@ -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 - 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 |