Commit b04fe998 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Better cannot-be-merged widget for MR


Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 4a5c968011e4
......@@ -31,4 +31,6 @@
.automerge_widget.cannot_be_merged.hide
.bs-callout.bs-callout-disabled
%h4
This request can't be merged with GitLab.
%span
......@@ -34,7 +36,7 @@
%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
......
Supports Markdown
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