Commit ab6aa8a4 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Split merge conflict messages on 2 lines

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 912233ec
- if @merge_request.can_be_merged_by?(current_user) - if @merge_request.can_be_merged_by?(current_user)
%h4 %h4
This merge 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 %p
You can merge it manually using the
%strong %strong
= link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal" = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
- else - else
......
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