add #2778 to changelog

Pylons · Apr 13, 2017 · 1b8a0c1 · 1b8a0c1
1 parent 16cd40b
commit 1b8a0c1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -141,6 +141,12 @@ Backward Incompatibilities
   (e.g. ``request.registry.settings.foo``). This was deprecated in Pyramid 1.2.
   See https://github.com/Pylons/pyramid/pull/2823
 
+- 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
+
 Features
 --------
 

diff --git a/docs/whatsnew-1.8.rst b/docs/whatsnew-1.8.rst
@@ -126,6 +126,13 @@ Minor Feature Additions
   later calls to place translation directories at a higher priority then
   earlier calls. See https://github.com/Pylons/pyramid/pull/2902
 
+- Added a new ``callback`` option to
+  :meth:`pyramid.config.Configurator.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
+
 Backwards Incompatibilities
 ---------------------------