kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Make issue due email more consistent with other mailers

This commit is contained in:
Sean McGivern 2018-04-17 12:44:22 +01:00
parent 86bf99a63b
commit fd4a082034
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/notify/issue_due_email.html.haml
View File

@ -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

2
spec/services/notification_service_spec.rb
View File

@ -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