From 4f8ebdd09835ad5c010c122ec669c1b224801302 Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Fri, 26 Apr 2019 08:51:58 +0200 Subject: [2.2.x] Fixed #30351 -- Handled pre-existing permissions in proxy model permissions data migration. Regression in 181fb60159e54d442d3610f4afba6f066a6dac05. Backport of 98296f86b340c8c9c968375d59f1d3a3479e60c2 from master --- docs/releases/2.2.1.txt | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'docs') diff --git a/docs/releases/2.2.1.txt b/docs/releases/2.2.1.txt index 98f800d455..9696488e14 100644 --- a/docs/releases/2.2.1.txt +++ b/docs/releases/2.2.1.txt @@ -59,3 +59,8 @@ Bugfixes * Increased the default timeout when using ``Watchman`` to 5 seconds to prevent falling back to ``StatReloader`` on larger projects and made it customizable via the ``DJANGO_WATCHMAN_TIMEOUT`` environment variable (:ticket:`30361`). + +* Fixed a regression in Django 2.2 that caused a crash when migrating + permissions for proxy models if the target permissions already existed. For + example, when a permission had been created manually or a model had been + migrated from concrete to proxy (:ticket:`30351`). -- cgit v1.3