summaryrefslogtreecommitdiff
path: root/app/views/projects/notes/discussions
diff options
context:
space:
mode:
authorGert Goet <gert@thinkcreate.nl>2015-08-06 21:06:14 +0200
committerGert Goet <gert@thinkcreate.nl>2015-08-06 21:39:22 +0200
commit7d2259b36f92a589c58634f56dddca6cd7037b1c (patch)
tree74c0824e33086de8e1eee416c986ff06e345bcc5 /app/views/projects/notes/discussions
parent912233ecd31136c302eeea63c7e2a9ca36ba742b (diff)
downloadgitlab-ce-7d2259b36f92a589c58634f56dddca6cd7037b1c.tar.gz
Diff colors on MR Discussion like on Changes-tab
Fixes #2216
Diffstat (limited to 'app/views/projects/notes/discussions')
-rw-r--r--app/views/projects/notes/discussions/_diff.html.haml15
1 files changed, 8 insertions, 7 deletions
diff --git a/app/views/projects/notes/discussions/_diff.html.haml b/app/views/projects/notes/discussions/_diff.html.haml
index 711aa39101b..0301445b5b2 100644
--- a/app/views/projects/notes/discussions/_diff.html.haml
+++ b/app/views/projects/notes/discussions/_diff.html.haml
@@ -12,18 +12,19 @@
.diff-content
%table
- note.truncated_diff_lines.each do |line|
+ - type = line.type
- line_code = generate_line_code(note.file_path, line)
- %tr.line_holder{ id: line_code }
- - if line.type == "match"
+ %tr.line_holder{ id: line_code, class: "#{type}" }
+ - if type == "match"
%td.old_line= "..."
%td.new_line= "..."
%td.line_content.matched= line.text
- else
- %td.old_line{class: line.type == "new" ? "new" : "old"}
- = raw(line.type == "new" ? "&nbsp;" : line.old_pos)
- %td.new_line{class: line.type == "new" ? "new" : "old"}
- = raw(line.type == "old" ? "&nbsp;" : line.new_pos)
- %td.line_content{class: "noteable_line #{line.type} #{line_code}", "line_code" => line_code}= raw diff_line_content(line.text)
+ %td.old_line
+ = raw(type == "new" ? "&nbsp;" : line.old_pos)
+ %td.new_line
+ = raw(type == "old" ? "&nbsp;" : line.new_pos)
+ %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
= render "projects/notes/diff_notes_with_reply", notes: discussion_notes