diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-08-29 10:48:15 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-08-29 10:48:15 +0000 |
commit | 1c687f7f219f913965d713994ae0dddb2682eef4 (patch) | |
tree | 2e4b30c2d6a7b36e47a5fa13792ad02d0a4c1126 | |
parent | ad666a697bdd3615183d7e2224cecf85f4d6def5 (diff) | |
parent | 55d0df7a9f106687a2a252cf70b403bfebb9942c (diff) | |
download | gitlab-ce-1c687f7f219f913965d713994ae0dddb2682eef4.tar.gz |
Merge branch '66524-issue-due-notification-emails-are-threaded-incorrectly' into 'master'
Resolve "Issue due notification emails are threaded incorrectly"
See merge request gitlab-org/gitlab-ce!32325
-rw-r--r-- | app/mailers/emails/issues.rb | 2 | ||||
-rw-r--r-- | changelogs/unreleased/66524-issue-due-notification-emails-are-threaded-incorrectly.yml | 5 | ||||
-rw-r--r-- | spec/mailers/notify_spec.rb | 16 |
3 files changed, 22 insertions, 1 deletions
diff --git a/app/mailers/emails/issues.rb b/app/mailers/emails/issues.rb index f3a3203f7ad..542085ea307 100644 --- a/app/mailers/emails/issues.rb +++ b/app/mailers/emails/issues.rb @@ -11,7 +11,7 @@ module Emails def issue_due_email(recipient_id, issue_id, reason = nil) setup_issue_mail(issue_id, recipient_id) - mail_new_thread(@issue, issue_thread_options(@issue.author_id, recipient_id, reason)) + mail_answer_thread(@issue, issue_thread_options(@issue.author_id, recipient_id, reason)) end def new_mention_in_issue_email(recipient_id, issue_id, updated_by_user_id, reason = nil) diff --git a/changelogs/unreleased/66524-issue-due-notification-emails-are-threaded-incorrectly.yml b/changelogs/unreleased/66524-issue-due-notification-emails-are-threaded-incorrectly.yml new file mode 100644 index 00000000000..a6a0ba4b4f4 --- /dev/null +++ b/changelogs/unreleased/66524-issue-due-notification-emails-are-threaded-incorrectly.yml @@ -0,0 +1,5 @@ +--- +title: Fix issue due notification emails not being threaded correctly +merge_request: 32325 +author: +type: fixed diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb index 6cba7df114c..56fa26d5f23 100644 --- a/spec/mailers/notify_spec.rb +++ b/spec/mailers/notify_spec.rb @@ -187,6 +187,22 @@ describe Notify do end end + describe 'that are due soon' do + subject { described_class.issue_due_email(recipient.id, issue.id) } + + before do + issue.update(due_date: Date.tomorrow) + end + + it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do + let(:model) { issue } + end + it_behaves_like 'it should show Gmail Actions View Issue link' + it_behaves_like 'an unsubscribeable thread' + it_behaves_like 'appearance header and footer enabled' + it_behaves_like 'appearance header and footer not enabled' + end + describe 'status changed' do let(:status) { 'closed' } subject { described_class.issue_status_changed_email(recipient.id, issue.id, status, current_user.id) } |