summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/admin/index.txt4
-rw-r--r--docs/releases/2.1.6.txt4
2 files changed, 6 insertions, 2 deletions
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index bd5547449f..d99552fb9a 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -2417,7 +2417,9 @@ The ``InlineModelAdmin`` class adds or customizes:
.. versionchanged:: 2.1
- The ``obj`` argument was added.
+ The ``obj`` argument was added. During the deprecation period, it may
+ also be ``None`` if third-party calls to ``has_add_permission()`` don't
+ provide it.
.. method:: InlineModelAdmin.has_change_permission(request, obj=None)
diff --git a/docs/releases/2.1.6.txt b/docs/releases/2.1.6.txt
index 894eb160b2..d5f342f546 100644
--- a/docs/releases/2.1.6.txt
+++ b/docs/releases/2.1.6.txt
@@ -9,4 +9,6 @@ Django 2.1.6 several bugs in 2.1.5.
Bugfixes
========
-* ...
+* Made the ``obj`` argument of ``InlineModelAdmin.has_add_permission()``
+ optional to restore backwards compatibility with third-party code that
+ doesn't provide it (:ticket:`30097`).