From 63c3c22534a5b47f263cea8b639497d469dbba9d Mon Sep 17 00:00:00 2001 From: Eliot Berriot Date: Thu, 4 Apr 2019 16:05:34 +0200 Subject: [PATCH] Fix #783: migration issue on develop --- api/config/settings/common.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/api/config/settings/common.py b/api/config/settings/common.py index 6268d884d..a85a46f97 100644 --- a/api/config/settings/common.py +++ b/api/config/settings/common.py @@ -185,10 +185,6 @@ MIDDLEWARE = ( "funkwhale_api.users.middleware.RecordActivityMiddleware", ) -# MIGRATIONS CONFIGURATION -# ------------------------------------------------------------------------------ -MIGRATION_MODULES = {"sites": "funkwhale_api.contrib.sites.migrations"} - # DEBUG # ------------------------------------------------------------------------------ # See: https://docs.djangoproject.com/en/dev/ref/settings/#debug @@ -229,7 +225,8 @@ MIGRATION_MODULES = { # see https://github.com/jazzband/django-oauth-toolkit/issues/634 # swappable models are badly designed in oauth2_provider # ignore migrations and provide our own models. - "oauth2_provider": None + "oauth2_provider": None, + "sites": "funkwhale_api.contrib.sites.migrations", } #