Commit 381a6283 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' of github.com:gitlabhq/gitlabhq

parents 82009929 67a28cea
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
- else - else
%td.old_line= raw(line.type == "new" ? " " : line.old_pos) %td.old_line= raw(line.type == "new" ? " " : line.old_pos)
%td.new_line= raw(line.type == "old" ? " " : line.new_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 - 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