diff options
| author | Pierre de La Morinerie <pierre@capitainetrain.com> | 2014-07-08 13:56:37 +0200 |
|---|---|---|
| committer | Pierre de La Morinerie <pierre@capitainetrain.com> | 2014-07-25 10:50:58 +0200 |
| commit | 32a6f41f1cd5bbea690461d2e930843266893f1b (patch) | |
| tree | 3feb96f5de22cb85b145006543c24dfeba478cd2 /app/mailers | |
| parent | 414afd68f3b9c529fa9de9f60bfe86994b1fda81 (diff) | |
| download | gitlab-ce-32a6f41f1cd5bbea690461d2e930843266893f1b.tar.gz | |
Include "Merge-request reopened" emails in the proper email thread
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/emails/merge_requests.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb index 935987e2ed1..9ecdac87d72 100644 --- a/app/mailers/emails/merge_requests.rb +++ b/app/mailers/emails/merge_requests.rb @@ -49,9 +49,10 @@ module Emails @updated_by = User.find updated_by_user_id @target_url = project_merge_request_url(@project, @merge_request) set_reference("merge_request_#{merge_request_id}") - mail(from: sender(updated_by_user_id), - to: recipient(recipient_id), - subject: subject("#{@merge_request.title} (##{@merge_request.iid}) #{@mr_status}")) + mail_answer_thread(@merge_request, + from: sender(updated_by_user_id), + to: recipient(recipient_id), + subject: subject("#{@merge_request.title} (##{@merge_request.iid}) #{@mr_status}")) end end |