blob: 9e0c8a9e06f98bfb3a0bafb5a463103caf2cd7e2 (
plain)
1
2
3
4
5
6
7
8
9
|
- if @allowed_to_merge
%h4
This merge request contains merge conflicts that must be resolved.
You can try it manually on the
%strong
= link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
- else
%strong This merge request contains merge conflicts that must be resolved.
Only those with write access to this repository can merge merge requests.
|
