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

Merge pull request #443 from CedricGatay/fix/incorrectLineNumberingInDiff

Browse source 
Incorrect line numbering in diff
This commit is contained in:
Dmitriy Zaporozhets 2012-02-22 07:14:54 -08:00
commit 9e6d0710e9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/helpers/commits_helper.rb
View file

@ -61,12 +61,12 @@ module CommitsHelper
full_line = html_escape(line.gsub(/\n/, '')).force_encoding("UTF-8") full_line = html_escape(line.gsub(/\n/, '')).force_encoding("UTF-8")
if line.match(/^@@ -/) if line.match(/^@@ -/)
next if line_old == 1 && line_new == 1
type = "match" type = "match"
line_old = line.match(/\-[0-9]*/)[0].to_i.abs rescue 0 line_old = line.match(/\-[0-9]*/)[0].to_i.abs rescue 0
line_new = line.match(/\+[0-9]*/)[0].to_i.abs rescue 0 line_new = line.match(/\+[0-9]*/)[0].to_i.abs rescue 0
next if line_old == 1 && line_new == 1
yield(line, type, nil, nil, nil) yield(line, type, nil, nil, nil)
next next
else else