Restore diff comments
This commit is contained in:
parent
3f7993b5ce
commit
16d17b78ca
2 changed files with 7 additions and 5 deletions
|
@ -6,6 +6,7 @@
|
|||
%table.text-file.code.js-syntax-highlight{ class: too_big ? 'hide' : '' }
|
||||
|
||||
- last_line = 0
|
||||
- raw_diff_lines = diff_file.diff_lines
|
||||
- diff_file.highlighted_diff_lines.each_with_index do |line, index|
|
||||
- type = line.type
|
||||
- last_line = line.new_pos
|
||||
|
@ -31,7 +32,7 @@
|
|||
- if @reply_allowed
|
||||
- comments = @line_notes.select { |n| n.line_code == line_code && n.active? }.sort_by(&:created_at)
|
||||
- unless comments.empty?
|
||||
= render "projects/notes/diff_notes_with_reply", notes: comments, line: line.text
|
||||
= render "projects/notes/diff_notes_with_reply", notes: comments, line: raw_diff_lines[index].text
|
||||
|
||||
- if last_line > 0
|
||||
= render "projects/diffs/match_line", {line: "",
|
||||
|
|
|
@ -12,9 +12,10 @@ module Gitlab
|
|||
end
|
||||
|
||||
def highlight
|
||||
@diff_lines.each_with_index do |diff_line, i|
|
||||
@diff_lines.map.with_index do |diff_line, i|
|
||||
diff_line = diff_line.dup
|
||||
# ignore highlighting for "match" lines
|
||||
next if diff_line.type == 'match' || diff_line.type == 'nonewline'
|
||||
next diff_line if diff_line.type == 'match' || diff_line.type == 'nonewline'
|
||||
|
||||
rich_line = highlight_line(diff_line, i)
|
||||
|
||||
|
@ -23,9 +24,9 @@ module Gitlab
|
|||
end
|
||||
|
||||
diff_line.text = rich_line.html_safe
|
||||
end
|
||||
|
||||
@diff_lines
|
||||
diff_line
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
|
Loading…
Reference in a new issue