aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2012-10-10 03:29:23 -0700
committerVijay Dev <vijaydev.cse@gmail.com>2012-10-10 03:29:23 -0700
commit27683b5259775c900057fe62d828f8742b1049d3 (patch)
treea97e03b810adf90b35e9f42e36ac8c329f3b01c9
parentf7f467d0417e3b48afb43791448cce574016e27c (diff)
parent74bd13479b4d779a824873d67d771b007567398d (diff)
downloadrails-27683b5259775c900057fe62d828f8742b1049d3.tar.gz
rails-27683b5259775c900057fe62d828f8742b1049d3.tar.bz2
rails-27683b5259775c900057fe62d828f8742b1049d3.zip
Merge pull request #7899 from asanghi/master
Add missing CHANGELOG relating to addition of callbacks to mailers
-rw-r--r--actionmailer/CHANGELOG.md4
-rw-r--r--guides/source/4_0_release_notes.md2
2 files changed, 6 insertions, 0 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index e29890f2d8..68b34805ff 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -27,4 +27,8 @@
* Asynchronously send messages via the Rails Queue *Brian Cardarella*
+* 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*
+
Please check [3-2-stable](https://github.com/rails/rails/blob/3-2-stable/actionmailer/CHANGELOG.md) for previous changes.
diff --git a/guides/source/4_0_release_notes.md b/guides/source/4_0_release_notes.md
index cce5bc5331..54fe49252f 100644
--- a/guides/source/4_0_release_notes.md
+++ b/guides/source/4_0_release_notes.md
@@ -141,6 +141,8 @@ Action Mailer
end
```
+* Allow for callbacks in mailers similar to ActionController::Base. You can now set up headers/attachments using `before_filter` or `after_filter`. You could also change delivery settings or prevent delivery in an after filter based on instance variables set in your mailer action. You have access to `ActionMailer::Base` instance methods like `message`, `attachments`, `headers`.
+
Action Pack
-----------