kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Make resolve these conflicts text a link to conflicts tab.

Browse source
This commit is contained in:
Fatih Acet 2016-07-11 19:18:28 +03:00
parent 1fbd6a967c
commit d438230a24
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/views/projects/merge_requests/widget/open/_conflicts.html.haml
View file

@ -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