diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-04-17 12:44:22 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-04-17 13:59:46 +0100 |
| commit | fd4a08203448d5ade7471549fe17169fb19c6484 (patch) | |
| tree | 63f680c1842b21f66868037a45967c6f8c0c1625 | |
| parent | 86bf99a63bfd1ef456da54d8f31c23c46e678f0c (diff) | |
| download | gitlab-ce-fd4a08203448d5ade7471549fe17169fb19c6484.tar.gz | |
Make issue due email more consistent with other mailers
| -rw-r--r-- | app/views/notify/issue_due_email.html.haml | 8 | ||||
| -rw-r--r-- | spec/services/notification_service_spec.rb | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/views/notify/issue_due_email.html.haml b/app/views/notify/issue_due_email.html.haml index 600e183cfdf..e81144b8fcb 100644 --- a/app/views/notify/issue_due_email.html.haml +++ b/app/views/notify/issue_due_email.html.haml @@ -1,13 +1,11 @@ -- if Gitlab::CurrentSettings.email_author_in_body - %p.details - #{link_to @issue.author_name, user_url(@issue.author)}'s issue is due soon. +%p.details + #{link_to @issue.author_name, user_url(@issue.author)}'s issue is due soon. - if @issue.assignees.any? %p Assignee: #{@issue.assignee_list} - %p - This issue is due on: #{@issue.due_date} + This issue is due on: #{@issue.due_date.to_s(:medium)} - if @issue.description %div diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb index cd10a13814e..55bbe954491 100644 --- a/spec/services/notification_service_spec.rb +++ b/spec/services/notification_service_spec.rb @@ -936,6 +936,8 @@ describe NotificationService, :mailer do describe '#issue_due' do before do + issue.update!(due_date: Date.today) + update_custom_notification(:issue_due, @u_guest_custom, resource: project) update_custom_notification(:issue_due, @u_custom_global) end |