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

[rails.git] / app / controllers / application_controller.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index fdc2ac4e8694191790ffadab11ae9bbe5e55dc54..7ce804ced01af000ada0560ee4f27f99046618ac 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -215,10 +215,10 @@ class ApplicationController < ActionController::Base
 
   ##
   # wrap a web page in a timeout
 
   ##
   # wrap a web page in a timeout

-  def web_timeout(&block)
+  def web_timeout(&)

     raise Timeout::Error if Settings.web_timeout.negative?
 
     raise Timeout::Error if Settings.web_timeout.negative?
 

-    Timeout.timeout(Settings.web_timeout, &block)
+    Timeout.timeout(Settings.web_timeout, &)

   rescue ActionView::Template::Error => e
     e = e.cause
 
   rescue ActionView::Template::Error => e
     e = e.cause