summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorPaul Donohue <git@PaulSD.com>2018-04-08 13:35:24 -0400
committerTim Graham <timograham@gmail.com>2018-04-12 13:11:53 -0400
commit1ed31efb8753f6c4fd263033ddebc2f008e43a68 (patch)
tree085ef498db188ea54a98a4a0ccfe3d8a8ad4976a /docs
parentd5018abf1c4e3c68f1a825d05eb9035325707e16 (diff)
[2.0.x] Fixed #29296 -- Fixed crashes in admindocs when a view is a callable object.
Backport of 33a0b7ac815588ed92dca215e153390af8bdbdda from master
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.11.13.txt3
-rw-r--r--docs/releases/2.0.5.txt3
2 files changed, 6 insertions, 0 deletions
diff --git a/docs/releases/1.11.13.txt b/docs/releases/1.11.13.txt
index b9fd3329ef..f72ccd8fd2 100644
--- a/docs/releases/1.11.13.txt
+++ b/docs/releases/1.11.13.txt
@@ -12,3 +12,6 @@ Bugfixes
* Fixed a regression in Django 1.11.8 where altering a field with a unique
constraint may drop and rebuild more foreign keys than necessary
(:ticket:`29193`).
+
+* Fixed crashes in ``django.contrib.admindocs`` when a view is a callable
+ object, such as ``django.contrib.syndication.views.Feed`` (:ticket:`29296`).
diff --git a/docs/releases/2.0.5.txt b/docs/releases/2.0.5.txt
index c88135aeb9..7107ba63e7 100644
--- a/docs/releases/2.0.5.txt
+++ b/docs/releases/2.0.5.txt
@@ -15,3 +15,6 @@ Bugfixes
* Fixed a regression in Django 1.11.8 where altering a field with a unique
constraint may drop and rebuild more foreign keys than necessary
(:ticket:`29193`).
+
+* Fixed crashes in ``django.contrib.admindocs`` when a view is a callable
+ object, such as ``django.contrib.syndication.views.Feed`` (:ticket:`29296`).