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

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

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 8e7213a9d35dd080ffe4d2798db9d0c7a879afce..9a3976f76dd83f20c6754a8f2334b108a008f5da 100644 (file)
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -13,12 +13,13 @@ Rails.application.configure do
   config.consider_all_requests_local = true
 
   # Enable/disable caching. By default caching is disabled.
   config.consider_all_requests_local = true
 
   # Enable/disable caching. By default caching is disabled.

+  # Run rails dev:cache to toggle caching.

   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 = {
   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}"
+      "Cache-Control" => "public, max-age=#{2.days.to_i}"

     }
   else
     config.action_controller.perform_caching = false
     }
   else
     config.action_controller.perform_caching = false


@@ -26,6 +27,9 @@ Rails.application.configure do
     config.cache_store = :null_store
   end
 
     config.cache_store = :null_store
   end
 

+  # Store uploaded files on the local file system (see config/storage.yml for options)
+  config.active_storage.service = :local
+

   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 


@@ -35,9 +39,10 @@ Rails.application.configure do
   config.active_support.deprecation = :log
 
   # Raise an error on page load if there are pending migrations.
   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 Settings.status == "database_offline"
+
+  # Highlight code that triggered database queries in logs.
+  config.active_record.verbose_query_logs = true unless Settings.status == "database_offline"

 
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large
 
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large


@@ -47,6 +52,9 @@ Rails.application.configure do
   # Suppress logger output for asset requests.
   config.assets.quiet = true
 
   # Suppress logger output for asset requests.
   config.assets.quiet = true
 

+  # Export translations automatically
+  config.middleware.use I18n::JS::Middleware
+

   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true