aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/middleware/callbacks.rb7
1 files changed, 1 insertions, 6 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/callbacks.rb b/actionpack/lib/action_dispatch/middleware/callbacks.rb
index 2f86a382c2..56d6da1706 100644
--- a/actionpack/lib/action_dispatch/middleware/callbacks.rb
+++ b/actionpack/lib/action_dispatch/middleware/callbacks.rb
@@ -2,7 +2,7 @@ module ActionDispatch
class Callbacks
include ActiveSupport::NewCallbacks
- define_callbacks :call, :terminator => "result == false", :scope => :kind
+ define_callbacks :call, :terminator => "result == false", :rescuable => true
define_callbacks :prepare, :scope => :name
# Add a preparation callback. Preparation callbacks are run before every
@@ -25,10 +25,6 @@ module ActionDispatch
set_callback(:call, :before, *args, &block)
end
- def self.around(*args, &block)
- set_callback(:call, :around, *args, &block)
- end
-
def self.after(*args, &block)
set_callback(:call, :after, *args, &block)
end
@@ -36,7 +32,6 @@ module ActionDispatch
class << self
# DEPRECATED
alias_method :before_dispatch, :before
- alias_method :around_dispatch, :around
alias_method :after_dispatch, :after
end