diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-15 15:15:40 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-15 15:15:40 +0300 |
| commit | 67a28cea303d7d61663cd92dc3d72a7a9c06999a (patch) | |
| tree | e1b0d0f3c8c75633dc5c6a18e704209d8babdcc4 | |
| parent | e853ddd8a9585c0a096417705c0985fe56538945 (diff) | |
| parent | 732e6c3dbb2a249ec486ece5646eb5fbe46e8680 (diff) | |
| download | gitlab-ce-67a28cea303d7d61663cd92dc3d72a7a9c06999a.tar.gz | |
Merge pull request #8048 from skv-headless/master
same rendering for note diff as for usual diff
| -rw-r--r-- | app/views/projects/notes/discussions/_diff.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/notes/discussions/_diff.html.haml b/app/views/projects/notes/discussions/_diff.html.haml index da71220af17..b4d1cce7980 100644 --- a/app/views/projects/notes/discussions/_diff.html.haml +++ b/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 |