forward port some history changes from 1.8-branch

Michael Merickel

2017-04-13 66585f47e2ccd36be6a3cd5679ccf60161d9db05

forward port some history changes from 1.8-branch

 HISTORY.txt

@@ -198,6 +198,12 @@

  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
---------


 docs/whatsnew-1.8.rst

@@ -114,6 +114,13 @@
  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
---------------------------