Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorEvgeniy Sokovikov <skv-headless@yandex.ru>2014-10-15 13:03:27 +0400
committerEvgeniy Sokovikov <skv-headless@yandex.ru>2014-10-15 13:03:27 +0400
commit732e6c3dbb2a249ec486ece5646eb5fbe46e8680 (patch)
treed41cb015aedbb8b3a078e3302b830cde9f298217 /app
parentb31535494e5e9d13a3643809c7699c9f6e512d21 (diff)
same rendering for note diff as for usual diff
Diffstat (limited to 'app')
-rw-r--r--app/views/projects/notes/discussions/_diff.html.haml2
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" ? "&nbsp;" : line.old_pos)
%td.new_line= raw(line.type == "old" ? "&nbsp;" : line.new_pos)
- %td.line_content{class: "noteable_line #{line.type} #{line_code}", "line_code" => line_code}= raw "#{line.text} &nbsp;"
+ %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