diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-03-30 21:06:09 -0600 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-05 17:44:14 +0100 |
| commit | 21e10888c3fc0fe545c0443cf0e23f593df847a4 (patch) | |
| tree | c6c89c2ea2c75ffae4529ab4dceb937ce2f6299a /app/views/notify/_note_email.text.erb | |
| parent | fe26b8af94e8e12a66249e28e34196a4f8b987c4 (diff) | |
| download | gitlab-ce-21e10888c3fc0fe545c0443cf0e23f593df847a4.tar.gz | |
Address review comments
Diffstat (limited to 'app/views/notify/_note_email.text.erb')
| -rw-r--r-- | app/views/notify/_note_email.text.erb | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/app/views/notify/_note_email.text.erb b/app/views/notify/_note_email.text.erb index f2db321859f..b25b513f4d8 100644 --- a/app/views/notify/_note_email.text.erb +++ b/app/views/notify/_note_email.text.erb @@ -1,12 +1,13 @@ -<% if @discussion -%> +<% discussion = @note.discussion unless @discussion.individual_note? -%> +<% if discussion && !discussion.individual_note? -%> <%= @note.author_name -%> -<% if @discussion.new_discussion? -%> +<% if discussion.new_discussion? -%> <%= " started a new discussion" -%> <% else -%> <%= " commented on a discussion" -%> <% end -%> -<% if @discussion.diff_discussion? -%> -<%= " on #{@discussion.file_path}" -%> +<% if discussion.diff_discussion? -%> +<%= " on #{discussion.file_path}" -%> <% end -%> <%= ":" -%> @@ -16,8 +17,8 @@ <% end -%> -<% if @discussion&.diff_discussion? -%> -<% @discussion.truncated_diff_lines(highlight: false).each do |line| -%> +<% if discussion&.diff_discussion? -%> +<% discussion.truncated_diff_lines(highlight: false).each do |line| -%> <%= "> #{line.text}\n" -%> <% end -%> |