diff options
| author | Felipe Artur <felipefac@gmail.com> | 2017-11-09 17:59:39 -0200 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2017-11-13 12:39:01 -0200 |
| commit | 5dd2862195f00e19ee9dccc126d01a8d2c484de0 (patch) | |
| tree | 638156b4cc45c4e603cc70898912d85ff10b6378 /app/views | |
| parent | 1bf689563bfde933cd3e8d3fb58cb36c1a45d3af (diff) | |
| download | gitlab-ce-5dd2862195f00e19ee9dccc126d01a8d2c484de0.tar.gz | |
Fix image diff notes email
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/notify/_note_email.html.haml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/app/views/notify/_note_email.html.haml b/app/views/notify/_note_email.html.haml index a80518f7986..3e36da31ea3 100644 --- a/app/views/notify/_note_email.html.haml +++ b/app/views/notify/_note_email.html.haml @@ -1,10 +1,15 @@ - discussion = @note.discussion if @note.part_of_discussion? +- diff_discussion = discussion&.diff_discussion? +- on_image = discussion.on_image? if diff_discussion + - if discussion + - phrase_end_char = on_image ? "." : ":" + %p.details - = succeed ':' do + = succeed phrase_end_char do = link_to @note.author_name, user_url(@note.author) - - if discussion.diff_discussion? + - if diff_discussion - if discussion.new_discussion? started a new discussion - else @@ -21,7 +26,7 @@ %p.details #{link_to @note.author_name, user_url(@note.author)} commented: -- if discussion&.diff_discussion? +- if diff_discussion && !on_image = content_for :head do = stylesheet_link_tag 'mailers/highlighted_diff_email' |