Download as
Browse Code »

Commit 92cb78749534567d9480e1753ca4fdb0cced3b39

Authored by Dmitriy Zaporozhets
1 parent d187ffeb
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Better cannot-be-merged widget for MR 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 1 changed file with 5 additions and 3 deletions   Show diff stats
app/views/projects/merge_requests/show/_mr_accept.html.haml
  Diff comments   View file @92cb787
... ... @@ -31,10 +31,12 @@
31 31  
32 32 .automerge_widget.cannot_be_merged.hide
33 33 .bs-callout.bs-callout-disabled
  34 + %h4
  35 + This request can't be merged with GitLab.
34 36 %span
35   - = link_to "Show how to merge", "#modal_merge_info", class: "how_to_merge_link btn padded", title: "How To Merge", "data-toggle" => "modal"
36   - &nbsp;
37   - %strong This request can't be merged with GitLab. You should do it manually
  37 + You should do it manually with
  38 + %strong
  39 + = link_to "command line", "#modal_merge_info", class: "how_to_merge_link", title: "How To Merge", "data-toggle" => "modal"
38 40  
39 41 .automerge_widget.unchecked
40 42 .bs-callout.bs-callout-warning
... ...