diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2012-09-14 07:50:35 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@plataformatec.com.br> | 2012-09-14 07:50:35 -0700 |
| commit | ae00adecf420703bd13f52ffad23eb417b2cf244 (patch) | |
| tree | 779bbf5b952d99fc3b44b99d02debf0ae61fb263 /actionpack | |
| parent | 84ba499b1645230dd90f46fa63e5d071ada49f37 (diff) | |
| parent | 23851290dc64b9e352618236e3504c76dad52b2c (diff) | |
| download | rails-ae00adecf420703bd13f52ffad23eb417b2cf244.tar.gz rails-ae00adecf420703bd13f52ffad23eb417b2cf244.tar.bz2 rails-ae00adecf420703bd13f52ffad23eb417b2cf244.zip | |
Merge pull request #7642 from lest/patch-1
update CHANGELOG
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG.md | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 36e8479441..729a1e8198 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,5 +1,21 @@ ## Rails 4.0.0 (unreleased) ## +* Allow to configure how unverified request will be handled using `:with` + option in `protect_from_forgery` method. + + Valid unverified request handling methods are: + + - `:exception` - Raises ActionController::InvalidAuthenticityToken exception. + - `:reset_session` - Resets the session. + - `:null_session` - Provides an empty session during request but doesn't + reset it completely. Used as default if `:with` option is not specified. + + New applications are generated with: + + protect_from_forgery :with => :exception + + *Sergey Nartimov* + * Add .rb template handler, this handler simply allows arbitrary Ruby code as a template. *Guillermo Iguaran* * Add `separator` option for `ActionView::Helpers::TextHelper#excerpt`: |