diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-11-27 07:43:59 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-11-27 07:43:59 +0100 |
| commit | fd83f9d51583c080072dc9fd00f02ad742e265d4 (patch) | |
| tree | 30a14f36d955e5f33eda81c7410023618a1a3d5b /actionpack/lib/action_controller | |
| parent | ce9456eca0c4ea77a42aaad5e8080842c1c01422 (diff) | |
| parent | c8c95fc519f9d0e23e012d4434e6c3fe0f6e2a62 (diff) | |
| download | rails-fd83f9d51583c080072dc9fd00f02ad742e265d4.tar.gz rails-fd83f9d51583c080072dc9fd00f02ad742e265d4.tar.bz2 rails-fd83f9d51583c080072dc9fd00f02ad742e265d4.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/request_forgery_protection.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal/request_forgery_protection.rb b/actionpack/lib/action_controller/metal/request_forgery_protection.rb index 02f577647e..148efbb081 100644 --- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb +++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb @@ -53,9 +53,13 @@ module ActionController #:nodoc: # class FooController < ApplicationController # protect_from_forgery :except => :index # - # # you can disable csrf protection on controller-by-controller basis: - # skip_before_filter :verify_authenticity_token - # end + # You can disable csrf protection on controller-by-controller basis: + # + # skip_before_filter :verify_authenticity_token + # + # It can also be disabled for specific controller actions: + # + # skip_before_filter :verify_authenticity_token, :except => [:create] # # Valid Options: # |