Skip to content

Commit

Permalink
add changelog for #7202
Browse files Browse the repository at this point in the history
  • Loading branch information
Aditya Sanghi committed Aug 6, 2012
1 parent bf39026 commit 9515038
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions actionmailer/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
## Rails 4.0.0 (unreleased) ##

* Prevent mail from being delievered within the mailer actions by setting `perform_deliveries: false` *Aditya Sanghi*

mail :to => user.email, :subject => "Campaign", :perform_deliveries => user.sendable?

Global perform_deliveries flag when set to false is not overridden however. This allows you to stop some emails
from being delivered based on Spam Content/Unsubscribed User criterion from within the mailer action.

* 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*
Expand Down

0 comments on commit 9515038

Please sign in to comment.