diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2013-09-18 19:42:34 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@plataformatec.com.br> | 2013-09-18 19:42:34 -0700 |
| commit | cb8174c57f46f3b11bc4662638539f45677d7dc1 (patch) | |
| tree | 71dd2eedbb8ea29d673bb6159672121804dbddb9 /actionpack/lib/action_controller | |
| parent | 1ea4a892a835ada735ba2943b20bdbfd39120e8c (diff) | |
| parent | 0f3124dd85b21abd7e1a5705f8574b62a6e46138 (diff) | |
| download | rails-cb8174c57f46f3b11bc4662638539f45677d7dc1.tar.gz rails-cb8174c57f46f3b11bc4662638539f45677d7dc1.tar.bz2 rails-cb8174c57f46f3b11bc4662638539f45677d7dc1.zip | |
Merge pull request #12279 from jbaudanza/reset_session
Calling reset_session inside of a controller with a NullSessionHash raises a nil exception.
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/request_forgery_protection.rb | 3 |
1 files changed, 3 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 573c739da4..bd64b1f812 100644 --- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb +++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb @@ -124,6 +124,9 @@ module ActionController #:nodoc: @loaded = true end + # no-op + def destroy; end + def exists? true end |