aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVipul A M <vipulnsward@gmail.com>2016-01-18 12:05:23 +0530
committerVipul A M <vipulnsward@gmail.com>2016-01-18 12:05:23 +0530
commitee14fbe4ee46efd1de8088b0d20d74e3f775379a (patch)
treedb1c908cf6cb68f55707a825168af4f849c6e616
parentd14db3700dc921ea5642403f81657776cc0a19fa (diff)
downloadrails-ee14fbe4ee46efd1de8088b0d20d74e3f775379a.tar.gz
rails-ee14fbe4ee46efd1de8088b0d20d74e3f775379a.tar.bz2
rails-ee14fbe4ee46efd1de8088b0d20d74e3f775379a.zip
Pass through AP CHANGELOG [ci skip]
-rw-r--r--actionpack/CHANGELOG.md4
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.