From 59d29811c5b5684fc5f24fb9ac31e405e0873aab Mon Sep 17 00:00:00 2001 From: Marcel Molina Date: Wed, 1 Feb 2006 03:22:18 +0000 Subject: [PATCH] Document the :xhr option for verifications. Closes #3666. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3507 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/CHANGELOG | 2 ++ actionpack/lib/action_controller/verification.rb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index f749a09f55..5ec106eb8e 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Document the :xhr option for verifications. #3666 [leeo] + * Added :only and :except controls to skip_before/after_filter just like for when you add filters [DHH] * Ensure that the instance variables are copied to the template when performing render :update. [Nicholas Seckar] 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 ClassMethods # must match the current request method in order for the action(s) to # be safely called. (The key should be a symbol: :get or # :post, for example.) + # * :xhr: true/false option to ensure that the request is coming + # from an Ajax call or not. # * :add_flash: a hash of name/value pairs that should be merged # into the session's flash if the prerequisites cannot be satisfied. # * :redirect_to: the redirection parameters to be used when -- GitLab