diff options
| author | Prathamesh Sonpatki <csonpatki@gmail.com> | 2016-02-24 22:34:46 +0530 |
|---|---|---|
| committer | Prathamesh Sonpatki <csonpatki@gmail.com> | 2016-02-24 22:35:15 +0530 |
| commit | 263d63c15d99978174795b72e5a8d71e3dcef171 (patch) | |
| tree | 8e9f0dedd6d64d142b0b26cd1452d2be3ec8fa27 /railties/lib | |
| parent | 280c6714a9e651f8e57bdc729150a20ce9c4b468 (diff) | |
| download | rails-263d63c15d99978174795b72e5a8d71e3dcef171.tar.gz rails-263d63c15d99978174795b72e5a8d71e3dcef171.tar.bz2 rails-263d63c15d99978174795b72e5a8d71e3dcef171.zip | |
Don't put config.action_mailer.perform_caching entry twice in development.rb
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt index 8e9890378a..e6a2de0928 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt @@ -16,10 +16,6 @@ Rails.application.configure do if Rails.root.join('tmp/caching-dev.txt').exist? config.action_controller.perform_caching = true - <%- unless options.skip_action_mailer? -%> - config.action_mailer.perform_caching = false - <%- end -%> - config.cache_store = :memory_store config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=172800' @@ -27,16 +23,14 @@ Rails.application.configure do else config.action_controller.perform_caching = false - <%- unless options.skip_action_mailer? -%> - config.action_mailer.perform_caching = false - <%- end -%> - config.cache_store = :null_store end <%- unless options.skip_action_mailer? -%> # Don't care if the mailer can't send. config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false <%- end -%> # Print deprecation notices to the Rails logger. |