home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 01:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity

Better cannot-be-merged widget for MR

Browse Source 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets
2014-01-06 15:58:10 +02:00
parent d187ffebee
commit 92cb787495
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/projects/merge_requests/show/_mr_accept.html.haml
+5 -3
View File
@@ -31,10 +31,12 @@
.automerge_widget.cannot_be_merged.hide
.bs-callout.bs-callout-disabled
%h4
This request can't be merged with GitLab.
%span
= link_to "Show how to merge", "#modal_merge_info", class: "how_to_merge_link btn padded", title: "How To Merge", "data-toggle" => "modal"
&nbsp;
%strong This request can't be merged with GitLab. You should do it manually
You should do it manually with
%strong
= link_to "command line", "#modal_merge_info", class: "how_to_merge_link", title: "How To Merge", "data-toggle" => "modal"
.automerge_widget.unchecked
.bs-callout.bs-callout-warning