diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-21 09:06:16 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-21 09:06:16 +0000 |
| commit | a048261403ea7e12992ccffe704f0779235712d7 (patch) | |
| tree | 59254549db6d39a4da824379a7bf354e7c8e7e67 /app/views/notify | |
| parent | 80e5134020483299c039114e76b734436f006c66 (diff) | |
| download | gitlab-ce-a048261403ea7e12992ccffe704f0779235712d7.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/notify')
| -rw-r--r-- | app/views/notify/_note_email.html.haml | 2 | ||||
| -rw-r--r-- | app/views/notify/_note_email.text.erb | 2 |
2 files changed, 2 insertions, 2 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 diff --git a/app/views/notify/_note_email.text.erb b/app/views/notify/_note_email.text.erb index a25daad8458..8e2f7e6f76e 100644 --- a/app/views/notify/_note_email.text.erb +++ b/app/views/notify/_note_email.text.erb @@ -7,7 +7,7 @@ <% if discussion.nil? -%> <%= 'commented' -%>: <% else -%> -<% if discussion.new_discussion? -%> +<% if note.start_of_discussion? -%> <%= 'started a new discussion' -%> <% else -%> <%= 'commented on a discussion' -%> |