diff options
| author | José Valim <jose.valim@gmail.com> | 2012-08-07 13:59:31 -0300 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-08-07 14:00:54 -0300 |
| commit | 485e655082c4ddbcde7788b3eac4bb8281b37d27 (patch) | |
| tree | 0e1001009001d66a13a685d2a3097099e8b7bbe4 /actionmailer/CHANGELOG.md | |
| parent | 666d3fd0c156a5c47eeddfe87dc466863890ba70 (diff) | |
| download | rails-485e655082c4ddbcde7788b3eac4bb8281b37d27.tar.gz rails-485e655082c4ddbcde7788b3eac4bb8281b37d27.tar.bz2 rails-485e655082c4ddbcde7788b3eac4bb8281b37d27.zip | |
Revert "Merge pull request #7202 from asanghi/perform_deliveries_in_mail"
Reverting because it feels backward to specify a delivery to not
be performed while the e-mail is being composed. It is simpler (and
makes more sense) to delegate the responsibility to the calling code.
Diffstat (limited to 'actionmailer/CHANGELOG.md')
| -rw-r--r-- | actionmailer/CHANGELOG.md | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index 68d7c7db93..96cfb43e0b 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -1,12 +1,5 @@ ## 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* |