summaryrefslogtreecommitdiff
path: root/app/views/notify
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2016-11-23 16:25:37 +0000
committerSean McGivern <sean@gitlab.com>2016-11-28 19:40:48 +0000
commit87665170eccfc423fc3f7fe2cadd208d808a6847 (patch)
tree4efa4d40139eacdfebe8e69d624e7bd62b20d03c /app/views/notify
parentb8917eb75e94cb13b02534c920ee926c9e97174e (diff)
downloadgitlab-ce-87665170eccfc423fc3f7fe2cadd208d808a6847.tar.gz
Diffstat (limited to 'app/views/notify')
-rw-r--r--app/views/notify/_note_mr_or_commit_email.html.haml6
1 files changed, 2 insertions, 4 deletions
diff --git a/app/views/notify/_note_mr_or_commit_email.html.haml b/app/views/notify/_note_mr_or_commit_email.html.haml
index 15e92c42b14..edf8dfe7e9e 100644
--- a/app/views/notify/_note_mr_or_commit_email.html.haml
+++ b/app/views/notify/_note_mr_or_commit_email.html.haml
@@ -3,12 +3,10 @@
New comment
-- if @note.diff_note? && @note.diff_file
+- if @discussion && @discussion.diff_file
on
= link_to @note.diff_file.file_path, @target_url, class: 'details'
-\:
-
-- if @discussion
+ \:
%table
= render partial: "projects/diffs/line",
collection: @discussion.truncated_diff_lines,