diff options
author | Vijay Dev <vijaydev.cse@gmail.com> | 2015-05-08 16:20:27 +0000 |
---|---|---|
committer | Vijay Dev <vijaydev.cse@gmail.com> | 2015-05-08 16:20:27 +0000 |
commit | 9c290fbe7f64e686416b7ca8590b680cf14e6357 (patch) | |
tree | c3c31ca5ace01382deeb2fa9ff6d4b4ca6e063aa /actionpack/lib | |
parent | 0b305bfe1a46b43f4954e5e692a8d7b905cd72d4 (diff) | |
parent | 92c0af217446ec8f557f9d47a04a0d19fc58b4a5 (diff) | |
download | rails-9c290fbe7f64e686416b7ca8590b680cf14e6357.tar.gz rails-9c290fbe7f64e686416b7ca8590b680cf14e6357.tar.bz2 rails-9c290fbe7f64e686416b7ca8590b680cf14e6357.zip |
Merge branch 'master' of github.com:rails/docrails
Diffstat (limited to 'actionpack/lib')
-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 31c8856437..356493bde6 100644 --- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb +++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb @@ -19,7 +19,7 @@ module ActionController #:nodoc: # # Since HTML and JavaScript requests are typically made from the browser, we # need to ensure to verify request authenticity for the web browser. We can - # use session-oriented authentication for these types requests, by using + # use session-oriented authentication for these types of requests, by using # the `protect_form_forgery` method in our controllers. # # GET requests are not protected since they don't have side effects like writing |