Skip to content
Browse files

Merge pull request #7275 from asanghi/perform_deliveries_in_mail

add changelog for #7202
  • Loading branch information...
2 parents bf39026 + 9515038 commit 02d31841bcf317d79925ca82dcc1bbf9079dc659 @rafaelfranca rafaelfranca committed Aug 6, 2012
Showing with 7 additions and 0 deletions.
  1. +7 −0 actionmailer/CHANGELOG.md
View
7 actionmailer/CHANGELOG.md
@@ -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*

0 comments on commit 02d3184

Please sign in to comment.
Something went wrong with that request. Please try again.