diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2016-01-18 07:41:47 +0100 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2016-01-18 07:41:47 +0100 |
| commit | 3bb6b7c7139eee36568f4f0e5a7a913ea2531872 (patch) | |
| tree | db1c908cf6cb68f55707a825168af4f849c6e616 /actionpack | |
| parent | d14db3700dc921ea5642403f81657776cc0a19fa (diff) | |
| parent | ee14fbe4ee46efd1de8088b0d20d74e3f775379a (diff) | |
| download | rails-3bb6b7c7139eee36568f4f0e5a7a913ea2531872.tar.gz rails-3bb6b7c7139eee36568f4f0e5a7a913ea2531872.tar.bz2 rails-3bb6b7c7139eee36568f4f0e5a7a913ea2531872.zip | |
Merge pull request #23098 from vipulnsward/changelog-pass
Pass through AP CHANGELOG
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index b47e73377c..e31838db2f 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -80,7 +80,7 @@ https://github.com/rails/rails/pull/18334#issuecomment-69234050 we want `protect_from_forgery` to default to `prepend: false`. - `protect_from_forgery` will now be insterted into the callback chain at the + `protect_from_forgery` will now be inserted into the callback chain at the point it is called in your application. This is useful for cases where you want to `protect_from_forgery` after you perform required authentication callbacks or other callbacks that are required to run after forgery protection. @@ -354,7 +354,7 @@ * Allow `Bearer` as token-keyword in `Authorization-Header`. - Aditionally to `Token`, the keyword `Bearer` is acceptable as a keyword + Additionally to `Token`, the keyword `Bearer` is acceptable as a keyword for the auth-token. The `Bearer` keyword is described in the original OAuth RFC and used in libraries like Angular-JWT. |