diff options
| author | Stan Lo <a22301613@yahoo.com.tw> | 2016-01-07 13:27:07 +0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-02-23 21:11:15 -0300 |
| commit | 3d7b0d480467b17715941503b1fe598e57c13ac1 (patch) | |
| tree | a8b2cf97c652f45466b0424f09288a5a3244513e /actionmailer/lib | |
| parent | f25cc147e90bf9bbfea44e3803bab8ca33ff35bd (diff) | |
| download | rails-3d7b0d480467b17715941503b1fe598e57c13ac1.tar.gz rails-3d7b0d480467b17715941503b1fe598e57c13ac1.tar.bz2 rails-3d7b0d480467b17715941503b1fe598e57c13ac1.zip | |
Change ActionMailer's default caching configuration and update generator's environment templates
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/railtie.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb index fce0d0f9f1..215d0199af 100644 --- a/actionmailer/lib/action_mailer/railtie.rb +++ b/actionmailer/lib/action_mailer/railtie.rb @@ -25,7 +25,7 @@ module ActionMailer options.javascripts_dir ||= paths["public/javascripts"].first options.stylesheets_dir ||= paths["public/stylesheets"].first options.show_previews = Rails.env.development? if options.show_previews.nil? - options.perform_caching ||= true + options.cache_store ||= Rails.cache if options.show_previews options.preview_path ||= defined?(Rails.root) ? "#{Rails.root}/test/mailers/previews" : nil |