Make resolve these conflicts text a link to conflicts tab.
This commit is contained in:
parent
1fbd6a967c
commit
d438230a24
1 changed files with 4 additions and 1 deletions
|
@ -3,7 +3,10 @@
|
||||||
This merge request contains merge conflicts
|
This merge request contains merge conflicts
|
||||||
|
|
||||||
%p
|
%p
|
||||||
Please resolve these conflicts or
|
Please
|
||||||
|
= link_to conflicts_namespace_project_merge_request_path(@project.namespace, @project, @merge_request) do
|
||||||
|
resolve these conflicts
|
||||||
|
or
|
||||||
- if @merge_request.can_be_merged_via_command_line_by?(current_user)
|
- if @merge_request.can_be_merged_via_command_line_by?(current_user)
|
||||||
#{link_to "merge this request manually", "#modal_merge_info", class: "how_to_merge_link vlink", "data-toggle" => "modal"}.
|
#{link_to "merge this request manually", "#modal_merge_info", class: "how_to_merge_link vlink", "data-toggle" => "modal"}.
|
||||||
- else
|
- else
|
||||||
|
|
Loading…
Reference in a new issue