Commit 92cb7874 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Better cannot-be-merged widget for MR

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent d187ffeb
...@@ -31,10 +31,12 @@ ...@@ -31,10 +31,12 @@
.automerge_widget.cannot_be_merged.hide .automerge_widget.cannot_be_merged.hide
.bs-callout.bs-callout-disabled .bs-callout.bs-callout-disabled
%h4
This request can't be merged with GitLab.
%span %span
= link_to "Show how to merge", "#modal_merge_info", class: "how_to_merge_link btn padded", title: "How To Merge", "data-toggle" => "modal" You should do it manually with
&nbsp; %strong
%strong This request can't be merged with GitLab. You should do it manually = link_to "command line", "#modal_merge_info", class: "how_to_merge_link", title: "How To Merge", "data-toggle" => "modal"
.automerge_widget.unchecked .automerge_widget.unchecked
.bs-callout.bs-callout-warning .bs-callout.bs-callout-warning
......
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