Commit 7d2259b3 authored by Gert Goet's avatar Gert Goet

Diff colors on MR Discussion like on Changes-tab

Fixes #2216
parent 912233ec
...@@ -12,18 +12,19 @@ ...@@ -12,18 +12,19 @@
.diff-content .diff-content
%table %table
- note.truncated_diff_lines.each do |line| - note.truncated_diff_lines.each do |line|
- type = line.type
- line_code = generate_line_code(note.file_path, line) - line_code = generate_line_code(note.file_path, line)
%tr.line_holder{ id: line_code } %tr.line_holder{ id: line_code, class: "#{type}" }
- if line.type == "match" - if type == "match"
%td.old_line= "..." %td.old_line= "..."
%td.new_line= "..." %td.new_line= "..."
%td.line_content.matched= line.text %td.line_content.matched= line.text
- else - else
%td.old_line{class: line.type == "new" ? "new" : "old"} %td.old_line
= raw(line.type == "new" ? " " : line.old_pos) = raw(type == "new" ? " " : line.old_pos)
%td.new_line{class: line.type == "new" ? "new" : "old"} %td.new_line
= raw(line.type == "old" ? " " : line.new_pos) = raw(type == "old" ? " " : line.new_pos)
%td.line_content{class: "noteable_line #{line.type} #{line_code}", "line_code" => line_code}= raw diff_line_content(line.text) %td.line_content{class: "noteable_line #{type} #{line_code}", "line_code" => line_code}= raw diff_line_content(line.text)
- if line_code == note.line_code - if line_code == note.line_code
= render "projects/notes/diff_notes_with_reply", notes: discussion_notes = render "projects/notes/diff_notes_with_reply", notes: discussion_notes
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment