diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index f749a09f5549f191bca165b8b8231adbe1c86876..5ec106eb8e5b5fe5cde687e18a97f138c46eb48f 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 774af345327afda02e51a9f72a18f7bc2fdad2e4..0bef8d85a88237bc6d26281ab4bdd7afbc577d32 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