diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-08-11 17:39:18 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-08-11 17:39:18 -0300 |
| commit | c18f81975c36961b053224c7aad4bce737373601 (patch) | |
| tree | 28d6f19643cbec9314dbe8a309cb43e3809d3317 /actionmailer/lib | |
| parent | df5ada78c0b0e962d65e89e7487fd35289dc9157 (diff) | |
| parent | 738be4457b964fe5e46d2eb7797e9055c4876de8 (diff) | |
| download | rails-c18f81975c36961b053224c7aad4bce737373601.tar.gz rails-c18f81975c36961b053224c7aad4bce737373601.tar.bz2 rails-c18f81975c36961b053224c7aad4bce737373601.zip | |
Merge pull request #21200 from mlbileschi/patch-1
fix comment about which mail headers are excluded
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 7022c04a9a..6f49e130d8 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -820,7 +820,7 @@ module ActionMailer # Set configure delivery behavior wrap_delivery_behavior!(headers.delete(:delivery_method), headers.delete(:delivery_method_options)) - # Assign all headers except parts_order, content_type and body + # Assign all headers except parts_order, content_type, body, template_name, and template_path assignable = headers.except(:parts_order, :content_type, :body, :template_name, :template_path) assignable.each { |k, v| m[k] = v } |