aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorMarcel Molina <marcel@vernix.org>2006-02-01 03:22:18 +0000
committerMarcel Molina <marcel@vernix.org>2006-02-01 03:22:18 +0000
commit59d29811c5b5684fc5f24fb9ac31e405e0873aab (patch)
tree06809e0d00791ac0ff66d6fd21c9f12161af442d /actionpack/lib
parentaee8db1584f452707e83ce31e0ad1a21c25febf8 (diff)
downloadrails-59d29811c5b5684fc5f24fb9ac31e405e0873aab.tar.gz
rails-59d29811c5b5684fc5f24fb9ac31e405e0873aab.tar.bz2
rails-59d29811c5b5684fc5f24fb9ac31e405e0873aab.zip
Document the :xhr option for verifications. Closes #3666.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3507 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/verification.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/verification.rb b/actionpack/lib/action_controller/verification.rb
index 774af34532..0bef8d85a8 100644
--- a/actionpack/lib/action_controller/verification.rb
+++ b/actionpack/lib/action_controller/verification.rb
@@ -47,6 +47,8 @@ module ActionController #:nodoc:
# must match the current request method in order for the action(s) to
# be safely called. (The key should be a symbol: <tt>:get</tt> or
# <tt>:post</tt>, for example.)
+ # * <tt>:xhr</tt>: true/false option to ensure that the request is coming
+ # from an Ajax call or not.
# * <tt>:add_flash</tt>: a hash of name/value pairs that should be merged
# into the session's flash if the prerequisites cannot be satisfied.
# * <tt>:redirect_to</tt>: the redirection parameters to be used when