Skip to content
Snippets Groups Projects
Commit fc193e50 authored by Fatih Acet's avatar Fatih Acet :call_me:
Browse files

Make resolve these conflicts text a link to conflicts tab.

parent 360d5d2d
No related branches found
No related tags found
No related merge requests found
......@@ -3,7 +3,10 @@
This merge request contains merge conflicts
%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_by?(current_user)
#{link_to "merge this request manually", "#modal_merge_info", class: "how_to_merge_link vlink", "data-toggle" => "modal"}.
- else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment