summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-04 14:47:57 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-04 14:47:57 -0800
commit60b80541cd866229a76a51ccca73d4d0ebef31be (patch)
tree8a2ac28ca87ed94c42ff08bc9edfdbcb8718811e
parentfc13ea713751d853693396aa77b51bbaa71c015b (diff)
parent39bfe0aa1d3a17858accce3b8118fd9fe2926cc7 (diff)
downloadgitlab-ce-60b80541cd866229a76a51ccca73d4d0ebef31be.tar.gz
Merge pull request #8726 from jvanbaarsen/sidebar-colors-comment
Also show colors in the sidebar of comment
-rw-r--r--app/views/projects/notes/discussions/_diff.html.haml6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/views/projects/notes/discussions/_diff.html.haml b/app/views/projects/notes/discussions/_diff.html.haml
index b4d1cce7980..f717c77a898 100644
--- a/app/views/projects/notes/discussions/_diff.html.haml
+++ b/app/views/projects/notes/discussions/_diff.html.haml
@@ -19,8 +19,10 @@
%td.new_line= "..."
%td.line_content.matched= line.text
- else
- %td.old_line= raw(line.type == "new" ? "&nbsp;" : line.old_pos)
- %td.new_line= raw(line.type == "old" ? "&nbsp;" : line.new_pos)
+ %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)
- if line_code == note.line_code