diff options
| author | Douwe Maan <douwe@selenight.nl> | 2018-12-20 15:26:07 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2018-12-20 16:40:52 +0100 |
| commit | ff5dace7bbb7674ef6fc3d630daf9c3ce7cc8bfa (patch) | |
| tree | 448a3343f1f10b913cbc7af6ddb81c14a2ed69b6 /app/views/notify | |
| parent | 34611f0dcded00b6878e72e07b45c416a0533b81 (diff) | |
| download | gitlab-ce-ff5dace7bbb7674ef6fc3d630daf9c3ce7cc8bfa.tar.gz | |
Always use colon at end of discussion notification email headline
Diffstat (limited to 'app/views/notify')
| -rw-r--r-- | app/views/notify/_note_email.html.haml | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/app/views/notify/_note_email.html.haml b/app/views/notify/_note_email.html.haml index 1fbae2f64ed..83c7f548975 100644 --- a/app/views/notify/_note_email.html.haml +++ b/app/views/notify/_note_email.html.haml @@ -4,17 +4,13 @@ - note_style = local_assigns.fetch(:note_style, "") - 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{ style: "color: #777777;" } - = succeed phrase_end_char do + = succeed ':' do = link_to note.author_name, user_url(note.author) - - if diff_discussion + - if discussion&.diff_discussion? - if discussion.new_discussion? started a new discussion - else @@ -31,7 +27,7 @@ %p.details #{link_to note.author_name, user_url(note.author)} commented: -- if diff_discussion && !on_image +- if discussion&.diff_discussion? && discussion.on_text? = content_for :head do = stylesheet_link_tag 'mailers/highlighted_diff_email' |