aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2012-04-01 19:53:29 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2012-04-01 19:53:29 +0530
commitcf182988f501a4a07a2e82295859aff6ddaacaf9 (patch)
tree4385c13cfff920d43c59506144b5f99d53c0c9f3 /actionpack/lib/action_controller/metal
parenteb154c529991ed77cd13035e6582178156ba9b32 (diff)
parenta5a9fc9afb77633fb16bb29e8d26b4c44958d82c (diff)
downloadrails-cf182988f501a4a07a2e82295859aff6ddaacaf9.tar.gz
rails-cf182988f501a4a07a2e82295859aff6ddaacaf9.tar.bz2
rails-cf182988f501a4a07a2e82295859aff6ddaacaf9.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller/metal')
-rw-r--r--actionpack/lib/action_controller/metal/request_forgery_protection.rb1
1 files changed, 0 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 3081c14c09..0bff1825d9 100644
--- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb
+++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
@@ -17,7 +17,6 @@ module ActionController #:nodoc:
# CSRF protection is turned on with the <tt>protect_from_forgery</tt> method,
# which checks the token and resets the session if it doesn't match what was expected.
# A call to this method is generated for new \Rails applications by default.
- # You can customize the error message by editing public/422.html.
#
# The token parameter is named <tt>authenticity_token</tt> by default. The name and
# value of this token must be added to every layout that renders forms by including