Merge pull request #6799 from Datacom/bug/parallel_diff_missing_lines_pr

Fix missing lines in Parallel Diff

Merge pull request #6799 from Datacom/bug/parallel_diff_missing_lines_pr
Fix missing lines in Parallel Diff
5ce14184 · Dmitriy Zaporozhets · aefdac00 · 5ef7fdbd · 5ce14184
Commit 5ce14184 authored May 06, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/helpers/commits_helper.rb app/helpers/commits_helper.rb +1 -1

No files found.
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -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