diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-01-22 02:12:43 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-01-22 02:12:43 +0100 |
| commit | 3db24ec9e80369834ccf7d2423808fcf5e51b5a6 (patch) | |
| tree | 9bf19c3a66363bab9ef948ad696eccb416fbf380 | |
| parent | 16d17b78cabe2efd762a4aa0e9fa2c2792fab32d (diff) | |
| download | gitlab-ce-fix-diff-comments.tar.gz | |
Properly highlight right side of parallel difffix-diff-comments
| -rw-r--r-- | lib/gitlab/diff/parallel_diff.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/diff/parallel_diff.rb b/lib/gitlab/diff/parallel_diff.rb index c0db3559e3a..74f9b3c050a 100644 --- a/lib/gitlab/diff/parallel_diff.rb +++ b/lib/gitlab/diff/parallel_diff.rb @@ -11,7 +11,8 @@ module Gitlab lines = [] skip_next = false - diff_file.highlighted_diff_lines.each do |line| + highlighted_diff_lines = diff_file.highlighted_diff_lines + highlighted_diff_lines.each do |line| full_line = line.text type = line.type line_code = generate_line_code(diff_file.file_path, line) @@ -21,6 +22,7 @@ module Gitlab next_line = diff_file.next_line(line.index) if next_line + next_line = highlighted_diff_lines[next_line.index] next_line_code = generate_line_code(diff_file.file_path, next_line) next_type = next_line.type next_line = next_line.text |