summaryrefslogtreecommitdiff
path: root/HISTORY.txt
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2017-04-12 22:37:56 -0500
committerMichael Merickel <michael@merickel.org>2017-04-12 22:37:56 -0500
commit66585f47e2ccd36be6a3cd5679ccf60161d9db05 (patch)
treec43b30576857304e0ef30ca80f4b302e3655ade2 /HISTORY.txt
parent8597552cbf9b49366c7d2a27c123d140877a1bab (diff)
downloadpyramid-66585f47e2ccd36be6a3cd5679ccf60161d9db05.tar.gz
pyramid-66585f47e2ccd36be6a3cd5679ccf60161d9db05.tar.bz2
pyramid-66585f47e2ccd36be6a3cd5679ccf60161d9db05.zip
forward port some history changes from 1.8-branch
Diffstat (limited to 'HISTORY.txt')
-rw-r--r--HISTORY.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/HISTORY.txt b/HISTORY.txt
index c10747af4..c69d9514e 100644
--- a/HISTORY.txt
+++ b/HISTORY.txt
@@ -198,6 +198,12 @@ Features
See https://github.com/Pylons/pyramid/pull/2873
+- Added a new ``callback`` option to ``config.set_default_csrf_options`` which
+ can be used to determine per-request whether CSRF checking should be enabled
+ to allow for a mix authentication methods. Only cookie-based methods
+ generally require CSRF checking.
+ See https://github.com/Pylons/pyramid/pull/2778
+
Bug Fixes
---------