aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2017-11-05 23:10:46 +0900
committerGitHub <noreply@github.com>2017-11-05 23:10:46 +0900
commit68efb01354ca0e5e318f6000d73e89bc2a958d8b (patch)
tree66826f4f452faf6c52b15e57fc56d3866c284b2a /actionpack
parent360698aa245b45349d1d1b12e1afb34759515e69 (diff)
parentab293293c33792621c90c02c5516a99e78460663 (diff)
downloadrails-68efb01354ca0e5e318f6000d73e89bc2a958d8b.tar.gz
rails-68efb01354ca0e5e318f6000d73e89bc2a958d8b.tar.bz2
rails-68efb01354ca0e5e318f6000d73e89bc2a958d8b.zip
Merge pull request #31055 from y-yagi/show_request_forgery_protection_methods_in_api_doc
Show `RequestForgeryProtection` methods in api doc [ci skip]
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/metal/request_forgery_protection.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/metal/request_forgery_protection.rb b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
index d6cd5fd9e0..bd133f24a1 100644
--- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb
+++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
@@ -248,6 +248,7 @@ module ActionController #:nodoc:
"If you know what you're doing, go ahead and disable forgery " \
"protection on this action to permit cross-origin JavaScript embedding."
private_constant :CROSS_ORIGIN_JAVASCRIPT_WARNING
+ # :startdoc:
# If `verify_authenticity_token` was run (indicating that we have
# forgery protection enabled for this request) then also verify that