Merge remote-tracking branch 'upstream/pull/1816'

[rails.git] / config / environments / development.rb

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 9101bb1ebc49485db70919089643860909c67e04..97226480c6dfdf1bb688ea94ce59ac1a7b6f127c 100644 (file)
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -12,6 +12,20 @@ Rails.application.configure do
   # Show full error reports.
   config.consider_all_requests_local = true
 
+  # Enable/disable caching. By default caching is disabled.
+  if Rails.root.join("tmp", "caching-dev.txt").exist?
+    config.action_controller.perform_caching = true
+
+    config.cache_store = :memory_store
+    config.public_file_server.headers = {
+      "Cache-Control" => "public, max-age=#{2.days.seconds.to_i}"
+    }
+  else
+    config.action_controller.perform_caching = false
+
+    config.cache_store = :null_store
+  end
+
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
@@ -21,9 +35,7 @@ Rails.application.configure do
   config.active_support.deprecation = :log
 
   # Raise an error on page load if there are pending migrations.
-  unless STATUS == :database_offline
-    config.active_record.migration_error = :page_load
-  end
+  config.active_record.migration_error = :page_load unless STATUS == :database_offline
 
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large