Skip to content

Commit

Permalink
Merge pull request #23098 from vipulnsward/changelog-pass
Browse files Browse the repository at this point in the history
Pass through AP CHANGELOG
  • Loading branch information
kaspth committed Jan 18, 2016
2 parents d14db37 + ee14fbe commit 3bb6b7c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions actionpack/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.

Expand Down

0 comments on commit 3bb6b7c

Please sign in to comment.