Download as
Browse Code »

Commit d9c20cf5a63dd1f337e408d26eb3f68750dadb75

Authored by Dmitriy Zaporozhets
1 parent b6fc0310
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix 404 errors on Merge Request -> new

Showing 3 changed files with 7 additions and 3 deletions   Show diff stats
app/helpers/commits_helper.rb
  Diff comments   View file @d9c20cf
@@ -65,4 +65,9 @@ module CommitsHelper @@ -65,4 +65,9 @@ module CommitsHelper
65 end 65 end
66 end 66 end
67 67
  68 + def commit_to_html commit
  69 + if commit.model
  70 + escape_javascript(render 'commits/commit', commit: commit)
  71 + end
  72 + end
68 end 73 end
app/views/merge_requests/branch_from.js.haml
  Diff comments   View file @d9c20cf
1 :plain 1 :plain
2 - $(".mr_source_commit").html("#{escape_javascript(render 'commits/commit', commit: @commit)}"); 2 + $(".mr_source_commit").html("#{commit_to_html(@commit)}");
app/views/merge_requests/branch_to.js.haml
  Diff comments   View file @d9c20cf
1 :plain 1 :plain
2 - $(".mr_target_commit").html("#{escape_javascript(render 'commits/commit', commit: @commit)}");  
3 - 2 + $(".mr_target_commit").html("#{commit_to_html(@commit)}");