aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/CHANGELOG.md
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2013-04-09 22:40:58 +0200
committerXavier Noria <fxn@hashref.com>2013-04-09 22:41:03 +0200
commite79d2c8aa61d480c9abbfba376fd03523ba23046 (patch)
tree9ff84adbe33cb98d89d2d95a05f6af668f5af8cc /actionmailer/CHANGELOG.md
parentee889510f82d34b1f911ef886bd63d47c079b6f0 (diff)
downloadrails-e79d2c8aa61d480c9abbfba376fd03523ba23046.tar.gz
rails-e79d2c8aa61d480c9abbfba376fd03523ba23046.tar.bz2
rails-e79d2c8aa61d480c9abbfba376fd03523ba23046.zip
copy-edit pass in AM changelog [ci skip]
Diffstat (limited to 'actionmailer/CHANGELOG.md')
-rw-r--r--actionmailer/CHANGELOG.md20
1 files changed, 11 insertions, 9 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 487e57be7b..975f61fa58 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -26,19 +26,19 @@
*Boris Staal*
* Explicit multipart messages no longer set the order of the MIME parts.
+
*Nate Berkopec*
-* Do not render views when mail() isn't called.
- Fixes #7761.
+* Do not render views when `mail` isn't called. Fixes #7761.
*Yves Senn*
-* Allow delivery method options to be set per mail instance *Aditya Sanghi*
+* Allow delivery method options to be set per mail instance.
- If your smtp delivery settings are dynamic,
- you can now override settings per mail instance for e.g.
+ If your SMTP delivery settings are dynamic, you can now override settings
+ per mail instance for e.g.
- def my_mailer(user,company)
+ def my_mailer(user, company)
mail to: user.email, subject: "Welcome!",
delivery_method_options: { user_name: company.smtp_user,
password: company.smtp_password }
@@ -47,14 +47,16 @@
This will ensure that your default SMTP settings will be overridden
by the company specific ones. You only have to override the settings
that are dynamic and leave the static setting in your environment
- configuration file (e.g. config/environments/production.rb)
+ configuration file (e.g. `config/environments/production.rb`).
+
+ *Aditya Sanghi*
-* Allow to set default Action Mailer options via `config.action_mailer.default_options=` *Robert Pankowecki*
+* Allow to set default Action Mailer options via `config.action_mailer.default_options=`. *Robert Pankowecki*
* Raise an `ActionView::MissingTemplate` exception when no implicit template could be found. *Damien Mathieu*
* Allow callbacks to be defined in mailers similar to `ActionController::Base`. You can configure default
settings, headers, attachments, delivery settings or change delivery using
- `before_filter`, `after_filter` etc. *Justin S. Leitgeb*
+ `before_filter`, `after_filter`, etc. *Justin S. Leitgeb*
Please check [3-2-stable](https://github.com/rails/rails/blob/3-2-stable/actionmailer/CHANGELOG.md) for previous changes.