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

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

diff --git a/config/environments/development.rb b/config/environments/development.rb
index ebdc959e9f8fab5296c0c439511237cd4ee38925..36a6f28204cb149371be89245b4c578c1c2bf18c 100644 (file)
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -14,6 +14,9 @@ Rails.application.configure do
   # Show full error reports.
   config.consider_all_requests_local = true
 
   # Show full error reports.
   config.consider_all_requests_local = true
 

+  # Enable server timing
+  config.server_timing = 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?
   # Enable/disable caching. By default caching is disabled.
   # Run rails dev:cache to toggle caching.
   if Rails.root.join("tmp/caching-dev.txt").exist?


@@ -65,15 +68,11 @@ Rails.application.configure do
   config.middleware.use I18n::JS::Middleware
 
   # Raises error for missing translations.
   config.middleware.use I18n::JS::Middleware
 
   # Raises error for missing translations.

-  # config.action_view.raise_on_missing_translations = true
+  # config.i18n.raise_on_missing_translations = true

 
   # Annotate rendered view with file names.
   # config.action_view.annotate_rendered_view_with_filenames = true
 
 
   # Annotate rendered view with file names.
   # config.action_view.annotate_rendered_view_with_filenames = true
 

-  # Use an evented file watcher to asynchronously detect changes in source code,
-  # routes, locales, etc. This feature depends on the listen gem.
-  config.file_watcher = ActiveSupport::EventedFileUpdateChecker
-

   # Uncomment if you wish to allow Action Cable access from any origin.
   # config.action_cable.disable_request_forgery_protection = true
 
   # Uncomment if you wish to allow Action Cable access from any origin.
   # config.action_cable.disable_request_forgery_protection = true