diff options
author | Matthew Draper <matthew@trebex.net> | 2018-08-29 14:07:37 +0930 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-29 14:07:37 +0930 |
commit | 068fe7dc9045856b822833db5cb7cb690e6000d7 (patch) | |
tree | e9c6ce3a42e29e09bb899b6e4c7e695d97b3c428 /actionpack/lib/action_controller/metal/request_forgery_protection.rb | |
parent | 28e5085070f95f32a6a909cce6d77fd460c73885 (diff) | |
parent | 7c9751d7fe3aec1e67004d1bb5e4a1702fcacafb (diff) | |
download | rails-068fe7dc9045856b822833db5cb7cb690e6000d7.tar.gz rails-068fe7dc9045856b822833db5cb7cb690e6000d7.tar.bz2 rails-068fe7dc9045856b822833db5cb7cb690e6000d7.zip |
Merge pull request #33718 from kddeisz/permit-list
Finish converting whitelist and blacklist references
Diffstat (limited to 'actionpack/lib/action_controller/metal/request_forgery_protection.rb')
-rw-r--r-- | actionpack/lib/action_controller/metal/request_forgery_protection.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/request_forgery_protection.rb b/actionpack/lib/action_controller/metal/request_forgery_protection.rb index 7ed7b9d546..cb109c6ad8 100644 --- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb +++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb @@ -45,7 +45,7 @@ module ActionController #:nodoc: # the same origin. Note however that any cross-origin third party domain # allowed via {CORS}[https://en.wikipedia.org/wiki/Cross-origin_resource_sharing] # will also be able to create XHR requests. Be sure to check your - # CORS whitelist before disabling forgery protection for XHR. + # CORS configuration before disabling forgery protection for XHR. # # CSRF protection is turned on with the <tt>protect_from_forgery</tt> method. # By default <tt>protect_from_forgery</tt> protects your session with |