diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2016-06-07 14:39:42 -0400 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2016-06-07 14:39:42 -0400 |
| commit | a4154d8efbc4921b48866cac8fd3cf5550ed9e78 (patch) | |
| tree | 2b320e24c5c914f7bc53b73f9909ebd3057cd501 /actionpack/lib/abstract_controller/callbacks.rb | |
| parent | 48033eaa4e7e4c517d81a609ea17bbee81528d4d (diff) | |
| parent | e6bb1a1b1f9c47414c588521ae05c02be923976f (diff) | |
| download | rails-a4154d8efbc4921b48866cac8fd3cf5550ed9e78.tar.gz rails-a4154d8efbc4921b48866cac8fd3cf5550ed9e78.tar.bz2 rails-a4154d8efbc4921b48866cac8fd3cf5550ed9e78.zip | |
Merge pull request #25079 from jeffkreeftmeijer/send_file-halts-request-cycle
Use `#performed?` to terminate controller callbacks
Diffstat (limited to 'actionpack/lib/abstract_controller/callbacks.rb')
| -rw-r--r-- | actionpack/lib/abstract_controller/callbacks.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/callbacks.rb b/actionpack/lib/abstract_controller/callbacks.rb index d63ce9c1c3..3ef8da86fa 100644 --- a/actionpack/lib/abstract_controller/callbacks.rb +++ b/actionpack/lib/abstract_controller/callbacks.rb @@ -9,7 +9,7 @@ module AbstractController included do define_callbacks :process_action, - terminator: ->(controller, result_lambda) { result_lambda.call if result_lambda.is_a?(Proc); controller.response_body }, + terminator: ->(controller, result_lambda) { result_lambda.call if result_lambda.is_a?(Proc); controller.performed? }, skip_after_callbacks_if_terminated: true end |