diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/verification.rb | 2 |
2 files changed, 4 insertions, 0 deletions
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 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 |