diff options
| author | rick <rick@spacemonkey.local> | 2008-05-10 17:46:55 -0700 |
|---|---|---|
| committer | rick <rick@spacemonkey.local> | 2008-05-10 17:46:55 -0700 |
| commit | d09a8446d5606a5a0b5c024224b09a1318e9cf4d (patch) | |
| tree | 199ef3554f731c980ea5726e67e34af4ea057c2e /actionpack/lib/action_controller/request_forgery_protection.rb | |
| parent | c8451aeeea200043d8a3e6eae9c49def3a154ddb (diff) | |
| parent | a7ea06b4ebe252e258f83e7de945b4baa30ec3bc (diff) | |
| download | rails-d09a8446d5606a5a0b5c024224b09a1318e9cf4d.tar.gz rails-d09a8446d5606a5a0b5c024224b09a1318e9cf4d.tar.bz2 rails-d09a8446d5606a5a0b5c024224b09a1318e9cf4d.zip | |
fix merge conflict with actionpack changelog
Diffstat (limited to 'actionpack/lib/action_controller/request_forgery_protection.rb')
| -rw-r--r-- | actionpack/lib/action_controller/request_forgery_protection.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/request_forgery_protection.rb b/actionpack/lib/action_controller/request_forgery_protection.rb index b52a2d4ff1..946a0ed152 100644 --- a/actionpack/lib/action_controller/request_forgery_protection.rb +++ b/actionpack/lib/action_controller/request_forgery_protection.rb @@ -69,10 +69,10 @@ module ActionController #:nodoc: # # Valid Options: # - # * <tt>:only/:except</tt> - passed to the <tt>before_filter</tt> call. Set which actions are verified. + # * <tt>:only/:except</tt> - Passed to the <tt>before_filter</tt> call. Set which actions are verified. # * <tt>:secret</tt> - Custom salt used to generate the <tt>form_authenticity_token</tt>. # Leave this off if you are using the cookie session store. - # * <tt>:digest</tt> - Message digest used for hashing. Defaults to 'SHA1' + # * <tt>:digest</tt> - Message digest used for hashing. Defaults to 'SHA1'. def protect_from_forgery(options = {}) self.request_forgery_protection_token ||= :authenticity_token before_filter :verify_authenticity_token, :only => options.delete(:only), :except => options.delete(:except) |