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

Fixed encoding issue for diff. Reordered merge request commits

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-02-15 00:41:36 +02:00
parent 65e4ad3147
commit ef396d08fc
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/commits_helper.rb
View file

@ -58,7 +58,7 @@ module CommitsHelper
next if line.match(/^\-\-\- a/)
next if line.match(/^\+\+\+ b/)
full_line = html_escape(line.gsub(/\n/, ''))
full_line = html_escape(line.gsub(/\n/, '')).force_encoding("UTF-8")
if line.match(/^@@ -/)
next if line_old == 1 && line_new == 1