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

Incorrect line numbering in diff

Browse source 
When displaying a diff, the line number always starts at one, even if the first diff is not at the first line
Fixes this to display correct line numbering on first diff
This commit is contained in:
Cedric Gatay 2012-02-22 16:04:41 +01:00
parent 8c40aab120
commit 6ea87c47f0
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")
if line.match(/^@@ -/)
next if line_old == 1 && line_new == 1
type = "match"
line_old = 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)
next
else