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

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

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 8e7213a9d35dd080ffe4d2798db9d0c7a879afce..97226480c6dfdf1bb688ea94ce59ac1a7b6f127c 100644 (file)
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -35,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