Make rupocop happy and correct placement of include

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

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 12cf912bc3c609e0459a6b55a27cda58262325b6..01466ae751953845c603f9806ce45251003f5d54 100644 (file)
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,31 +1,43 @@
 OpenStreetMap::Application.configure do
 OpenStreetMap::Application.configure do

-  # Settings specified here will take precedence over those in config/application.rb
+  # Settings specified here will take precedence over those in config/application.rb.

 
   # In the development environment your application's code is reloaded on
 
   # In the development environment your application's code is reloaded on

-  # every request.  This slows down response time but is perfect for development
+  # every request. This slows down response time but is perfect for development

   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 

-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  # Do not eager load code on boot.
+  config.eager_load = false

 
 

-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.

   config.consider_all_requests_local       = true
   config.consider_all_requests_local       = true

-#  config.action_view.debug_rjs             = true

   config.action_controller.perform_caching = false
 
   config.action_controller.perform_caching = false
 

-  # Don't care if the mailer can't send
+  # Don't care if the mailer can't send.

   config.action_mailer.raise_delivery_errors = false
 
   config.action_mailer.raise_delivery_errors = false
 

-  # Print deprecation notices to the Rails logger
+  # Print deprecation notices to the Rails logger.

   config.active_support.deprecation = :log
 
   config.active_support.deprecation = :log
 

-  # Only use best-standards-support built into browsers
-  config.action_dispatch.best_standards_support = :builtin
+  # Raise an error on page load if there are pending migrations.
+  unless STATUS == :database_offline
+    config.active_record.migration_error = :page_load
+  end

 
 

-  # Do not compress assets
-  config.assets.compress = false
-
-  # Expands the lines which load the assets
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.

   config.assets.debug = true
   config.assets.debug = true

+
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
+  config.assets.digest = true
+
+  # Adds additional error checking when serving assets at runtime.
+  # Checks for improperly declared sprockets dependencies.
+  # Raises helpful error messages.
+  config.assets.raise_runtime_errors = true
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true

 end
 end