diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-08-06 11:52:46 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-08-06 11:52:46 -0700 |
| commit | 02d31841bcf317d79925ca82dcc1bbf9079dc659 (patch) | |
| tree | 89b31a781a85de62331a0df0ea13b9372c24996b /actionmailer | |
| parent | bf39026d567021f80f25affb8d2ddc4b3560def6 (diff) | |
| parent | 951503819e067ee87569137111016e375d7b6a2b (diff) | |
| download | rails-02d31841bcf317d79925ca82dcc1bbf9079dc659.tar.gz rails-02d31841bcf317d79925ca82dcc1bbf9079dc659.tar.bz2 rails-02d31841bcf317d79925ca82dcc1bbf9079dc659.zip | |
Merge pull request #7275 from asanghi/perform_deliveries_in_mail
add changelog for #7202
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/CHANGELOG.md | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index 96cfb43e0b..68d7c7db93 100644 --- a/actionmailer/CHANGELOG.md +++ b/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* |