summaryrefslogtreecommitdiff
path: root/app/views/notify/_note_email.html.haml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-21 09:06:16 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-21 09:06:16 +0000
commita048261403ea7e12992ccffe704f0779235712d7 (patch)
tree59254549db6d39a4da824379a7bf354e7c8e7e67 /app/views/notify/_note_email.html.haml
parent80e5134020483299c039114e76b734436f006c66 (diff)
downloadgitlab-ce-a048261403ea7e12992ccffe704f0779235712d7.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/notify/_note_email.html.haml')
-rw-r--r--app/views/notify/_note_email.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/notify/_note_email.html.haml b/app/views/notify/_note_email.html.haml
index dc5529b489b..c558358725c 100644
--- a/app/views/notify/_note_email.html.haml
+++ b/app/views/notify/_note_email.html.haml
@@ -11,7 +11,7 @@
- if discussion.nil?
commented
- else
- - if discussion.new_discussion?
+ - if note.start_of_discussion?
started a new
- else
commented on a