From a048261403ea7e12992ccffe704f0779235712d7 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 21 Nov 2019 09:06:16 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/views/notify/_note_email.html.haml | 2 +- app/views/notify/_note_email.text.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views/notify') 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' -%> -- cgit v1.2.3