From: Go MAEDA <maeda@farend.jp>
Date: Thu, 12 Sep 2019 21:52:21 +0000 (+0000)
Subject: Add additional mail headers for issue tracker (#31910).
X-Git-Tag: 4.1.0~620
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=59968110a3a18e86de57fb6d29fb7d3600a45189;p=redmine.git

Add additional mail headers for issue tracker (#31910).

Patch by Go MAEDA.


git-svn-id: http://svn.redmine.org/redmine/trunk@18459 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index e13abacbd..74ceaecfe 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -70,6 +70,7 @@ class Mailer < ActionMailer::Base
   # Builds a mail for notifying user about a new issue
   def issue_add(user, issue)
     redmine_headers 'Project' => issue.project.identifier,
+                    'Issue-Tracker' => issue.tracker.name,
                     'Issue-Id' => issue.id,
                     'Issue-Author' => issue.author.login
     redmine_headers 'Issue-Assignee' => issue.assigned_to.login if issue.assigned_to
@@ -101,6 +102,7 @@ class Mailer < ActionMailer::Base
   def issue_edit(user, journal)
     issue = journal.journalized
     redmine_headers 'Project' => issue.project.identifier,
+                    'Issue-Tracker' => issue.tracker.name,
                     'Issue-Id' => issue.id,
                     'Issue-Author' => issue.author.login
     redmine_headers 'Issue-Assignee' => issue.assigned_to.login if issue.assigned_to
diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb
index 89b2a451d..7e129a4f5 100644
--- a/test/unit/mailer_test.rb
+++ b/test/unit/mailer_test.rb
@@ -208,6 +208,7 @@ class MailerTest < ActiveSupport::TestCase
     assert_equal 'auto-generated', mail.header['Auto-Submitted'].to_s
     # List-Id should not include the display name "Redmine"
     assert_equal '<redmine.example.net>', mail.header['List-Id'].to_s
+    assert_equal 'Bug', mail.header['X-Redmine-Issue-Tracker'].to_s
   end
 
   def test_email_headers_should_include_sender