mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-19 09:36:47 +10:00
Merge pull request #6799 from Datacom/bug/parallel_diff_missing_lines_pr
Fix missing lines in Parallel Diff
This commit is contained in:
@@ -117,7 +117,7 @@ module CommitsHelper
|
||||
added_lines[line_new] = { line_code: line_code, type: type, line: line }
|
||||
end
|
||||
end
|
||||
max_length = old_file ? old_file.sloc + added_lines.length : file.sloc
|
||||
max_length = old_file ? [old_file.loc, file.loc].max : file.loc
|
||||
|
||||
offset1 = 0
|
||||
offset2 = 0
|
||||
|
||||
Reference in New Issue
Block a user