diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-06 16:34:33 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-06 16:34:33 +0400 |
| commit | 5ce14184068490ec972d154df5b283c8797a545b (patch) | |
| tree | 0b5fa6a62c227444ea831435f2c00b8f9069ce92 /app | |
| parent | aefdac00a2eb02279a7701b963f5b4d770c3a1a6 (diff) | |
| parent | 5ef7fdbd54ef41de01b64b4df58529d4bf3c62a3 (diff) | |
Merge pull request #6799 from Datacom/bug/parallel_diff_missing_lines_pr
Fix missing lines in Parallel Diff
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/commits_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb index de081acc2ba..c4abdbdabc7 100644 --- 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 |