aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2018-03-22 03:03:23 +0900
committerGitHub <noreply@github.com>2018-03-22 03:03:23 +0900
commit98224f8219ead8abdcb5dda1798b2c986dcfd565 (patch)
treede27b1b632fc373a23d626a8717e58fb338e8639 /actionpack
parent7e06d9cb2cf838a2ca0a7eb09d88824135ec2b5a (diff)
parent9c6b3204d445a67c54cf8243a7e38bb6cbf6e267 (diff)
downloadrails-98224f8219ead8abdcb5dda1798b2c986dcfd565.tar.gz
rails-98224f8219ead8abdcb5dda1798b2c986dcfd565.tar.bz2
rails-98224f8219ead8abdcb5dda1798b2c986dcfd565.zip
Merge pull request #32253 from zwass/before_action_docs
Add cancellation info to before filter docs [ci skip]
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/abstract_controller/callbacks.rb12
1 files changed, 12 insertions, 0 deletions
diff --git a/actionpack/lib/abstract_controller/callbacks.rb b/actionpack/lib/abstract_controller/callbacks.rb
index 146d17cf40..42bab411d2 100644
--- a/actionpack/lib/abstract_controller/callbacks.rb
+++ b/actionpack/lib/abstract_controller/callbacks.rb
@@ -103,6 +103,10 @@ module AbstractController
# :call-seq: before_action(names, block)
#
# Append a callback before actions. See _insert_callbacks for parameter details.
+ #
+ # If the callback renders or redirects, the action will not run. If there
+ # are additional callbacks scheduled to run after that callback, they are
+ # also cancelled.
##
# :method: prepend_before_action
@@ -110,6 +114,10 @@ module AbstractController
# :call-seq: prepend_before_action(names, block)
#
# Prepend a callback before actions. See _insert_callbacks for parameter details.
+ #
+ # If the callback renders or redirects, the action will not run. If there
+ # are additional callbacks scheduled to run after that callback, they are
+ # also cancelled.
##
# :method: skip_before_action
@@ -124,6 +132,10 @@ module AbstractController
# :call-seq: append_before_action(names, block)
#
# Append a callback before actions. See _insert_callbacks for parameter details.
+ #
+ # If the callback renders or redirects, the action will not run. If there
+ # are additional callbacks scheduled to run after that callback, they are
+ # also cancelled.
##
# :method: after_action