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

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

diff --git a/config/environments/development.rb b/config/environments/development.rb
index b7e60eb4fd9ad352854f96bcee53fa52d3518afc..9a3976f76dd83f20c6754a8f2334b108a008f5da 100644 (file)
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -39,10 +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.

-  config.active_record.migration_error = :page_load unless STATUS == :database_offline
+  config.active_record.migration_error = :page_load unless Settings.status == "database_offline"

 
   # Highlight code that triggered database queries in logs.
 
   # Highlight code that triggered database queries in logs.

-  config.active_record.verbose_query_logs = true
+  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