diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-06-26 00:04:09 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-06-26 00:04:09 -0700 |
| commit | ee74366da35a41d9ec02c42f27086410538f3a9c (patch) | |
| tree | 9920b3c72f28d6d81e63e4ec3372d2f99d19cf88 /railties | |
| parent | 755d1636107f814c6e0f76e7b3f327b9b4bdcc07 (diff) | |
| parent | 35717a9370e4d0ee312aa591bc2674004cfbadba (diff) | |
| download | rails-ee74366da35a41d9ec02c42f27086410538f3a9c.tar.gz rails-ee74366da35a41d9ec02c42f27086410538f3a9c.tar.bz2 rails-ee74366da35a41d9ec02c42f27086410538f3a9c.zip | |
Merge pull request #6839 from bcardarella/async-actionmailer
Async actionmailer
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG.md | 3 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/application.rb | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index e19aa68407..65f4b06699 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -39,6 +39,9 @@ * Rails::Plugin has gone. Instead of adding plugins to vendor/plugins use gems or bundler with path or git dependencies. *Santiago Pastorino* +* Set config.action_mailer.async = true to turn on asynchronous + message delivery *Brian Cardarella* + ## Rails 3.2.2 (March 1, 2012) ## diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb index 2b8e5b5dcd..5915d20010 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -67,5 +67,8 @@ module <%= app_const_base %> # Version of your assets, change this if you want to expire all your assets. config.assets.version = '1.0' <% end -%> + + # Enable app-wide asynchronous ActionMailer + # config.action_mailer.async = true end end |