Merge branch 'more-email-threading' into 'master'

Additions to email threading

This MR follows !142:

* Add threading to "Merge request reopened" emails (see 310231dbed83e66ad4d17b8c25f225f60b30eeb7)

See merge request !145

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