deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix 404 errors on Merge Request -> new

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-10-31 14:29:42 +02:00
parent b6fc031031
commit d9c20cf5a6
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/helpers/commits_helper.rb
View file

@ -65,4 +65,9 @@ module CommitsHelper
end
end
def commit_to_html commit
if commit.model
escape_javascript(render 'commits/commit', commit: commit)
end
end
end

2
app/views/merge_requests/branch_from.js.haml
View file

@ -1,2 +1,2 @@
:plain
$(".mr_source_commit").html("#{escape_javascript(render 'commits/commit', commit: @commit)}");
$(".mr_source_commit").html("#{commit_to_html(@commit)}");

3
app/views/merge_requests/branch_to.js.haml
View file

@ -1,3 +1,2 @@
:plain
$(".mr_target_commit").html("#{escape_javascript(render 'commits/commit', commit: @commit)}");
$(".mr_target_commit").html("#{commit_to_html(@commit)}");