BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 67a28cea by Dmitriy Zaporozhets
Options

Merge pull request #8048 from skv-headless/master

same rendering for note diff as for usual diff
parents e853ddd8 732e6c3d
Showing with 1 addition and 1 deletion
app/views/projects/notes/discussions/_diff.html.haml
......@@ -21,7 +21,7 @@
- else
%td.old_line= raw(line.type == "new" ? " " : line.old_pos)
%td.new_line= raw(line.type == "old" ? " " : line.new_pos)
%td.line_content{class: "noteable_line #{line.type} #{line_code}", "line_code" => line_code}= raw "#{line.text}  "
%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
= 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