aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/CHANGELOG.md
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2018-11-19 19:23:44 -0500
committerRafael Mendonça França <rafaelmfranca@gmail.com>2018-11-19 19:23:44 -0500
commit72062c8c9d32237d1eb7d3eb3318f65042383408 (patch)
tree7168d4225215f2a2df61e31b45e92258fc11f8db /actionmailer/CHANGELOG.md
parent4aad2e2228b2127680e6b5aaba5c0cf0e09b1467 (diff)
parent5c54db290f4e7cdd69b461d4c0b020a9cd364537 (diff)
downloadrails-72062c8c9d32237d1eb7d3eb3318f65042383408.tar.gz
rails-72062c8c9d32237d1eb7d3eb3318f65042383408.tar.bz2
rails-72062c8c9d32237d1eb7d3eb3318f65042383408.zip
Merge pull request #22534 from evopark/master
ActionMailer: support overriding template name in multipart
Diffstat (limited to 'actionmailer/CHANGELOG.md')
-rw-r--r--actionmailer/CHANGELOG.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index db6fc7ee9c..35574a2c73 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,3 +1,8 @@
+* Mails with multipart `format` blocks with implicit render now also check for
+ a template name in options hash instead of only using the action name.
+
+ *Marcus Ilgner*
+
* Allow ActionMailer classes to configure the parameterized delivery job
Example:
```