From 263d63c15d99978174795b72e5a8d71e3dcef171 Mon Sep 17 00:00:00 2001 From: Prathamesh Sonpatki <csonpatki@gmail.com> Date: Wed, 24 Feb 2016 22:34:46 +0530 Subject: Don't put config.action_mailer.perform_caching entry twice in development.rb --- .../rails/app/templates/config/environments/development.rb.tt | 10 ++-------- 1 file 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. -- cgit v1.2.3