Make resolve these conflicts text a link to conflicts tab.

d438230a · Fatih Acet · 1fbd6a96 · d438230a
Commit d438230a authored Jul 11, 2016 by Fatih Acet
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

app/views/projects/merge_requests/widget/open/_conflicts.html.haml .../projects/merge_requests/widget/open/_conflicts.html.haml +4 -1

No files found.
--- a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml
@@ -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_via_command_line_by?(current_user)
    #{link_to "merge this request manually", "#modal_merge_info", class: "how_to_merge_link vlink", "data-toggle" => "modal"}.
  - else