summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.rst15
-rw-r--r--CONTRIBUTORS.txt1
2 files changed, 15 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 73562c003..53bf0ab60 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -12,6 +12,12 @@ Features
documentation for more information about why this change was made.
See https://github.com/Pylons/pyramid/pull/3413
+- It is now possible to declare a route to not contain a trailing slash
+ when it is mounted via ``config.include(..., route_prefix=...)`` or via
+ ``with config.route_prefix_context(...)`` by specifying a ``pattern`` of
+ ``''``. This change is backward incompatible, see the notes below.
+ See https://github.com/Pylons/pyramid/pull/3414
+
Bug Fixes
---------
@@ -68,6 +74,15 @@ Backward Incompatibilities
documentation for more information about why this change was made.
See https://github.com/Pylons/pyramid/pull/3413
+- Changed the URL generation and matching for a route with a ``pattern`` of
+ ``''`` when the route is mounted with a ``route_prefix`` via either
+ ``config.include(..., route_prefix=...)`` or
+ ``with config.route_prefix_context(...)``. This route will now match a bare
+ URL without a trailing slash. To preserve the old behavior, set the
+ ``pattern`` to ``'/'`` instead of the empty string and the URL will contain
+ a trailing slash. This only affects mounted routes using ``route_prefix``.
+ See https://github.com/Pylons/pyramid/pull/3414
+
Documentation Changes
---------------------
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 6eb42c18c..79e4287d2 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -230,7 +230,6 @@ Contributors
- Antti Haapala, 2013/11/15
- Amit Mane, 2014/01/23
-<<<<<<< HEAD
- Fenton Travers, 2014/05/06