aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/CHANGELOG.md
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-07-06 18:36:27 -0700
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-07-06 18:36:27 -0700
commit842f27dd8227289ab4fd232bf89944584ad38fae (patch)
tree99b166dc1619b45e1a6da8c2bfe524c7e4f269e5 /actionmailer/CHANGELOG.md
parent4503926e4d0775bb8e3b1267e9341c0d7307cca9 (diff)
parentedaa2c48179681efd96d0cad4b5dea696a2a31fb (diff)
downloadrails-842f27dd8227289ab4fd232bf89944584ad38fae.tar.gz
rails-842f27dd8227289ab4fd232bf89944584ad38fae.tar.bz2
rails-842f27dd8227289ab4fd232bf89944584ad38fae.zip
Merge pull request #6950 from paneq/default_from2
Introduce config.action_mailer.default_options= Allows to easily set :from, :replay_to, etc. options in config/application.rb using simple syntax: config.action_mailer.default_options = { from: "no-replay@example.org" } Closes #6747
Diffstat (limited to 'actionmailer/CHANGELOG.md')
-rw-r--r--actionmailer/CHANGELOG.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 4d8f739403..177dc8109f 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -4,6 +4,8 @@
* Asynchronously send messages via the Rails Queue *Brian Cardarella*
+* Set default Action Mailer options via config.action_mailer.default_options= *Robert Pankowecki*
+
## Rails 3.2.5 (Jun 1, 2012) ##
* No changes.