MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '783-migration-error' into 'develop' 

Fix #783: migration issue on develop

Closes #783

See merge request funkwhale/funkwhale!704
This commit is contained in:
Eliot Berriot 2019-04-04 16:08:11 +02:00
parent 47b3b1ae0a 63c3c22534
commit 48ce87d25f
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/config/settings/common.py
View File

@ -185,10 +185,6 @@ MIDDLEWARE = (
"funkwhale_api.users.middleware.RecordActivityMiddleware", "funkwhale_api.users.middleware.RecordActivityMiddleware",
) )
# MIGRATIONS CONFIGURATION
# ------------------------------------------------------------------------------
MIGRATION_MODULES = {"sites": "funkwhale_api.contrib.sites.migrations"}
# DEBUG # DEBUG
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# See: https://docs.djangoproject.com/en/dev/ref/settings/#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 # see https://github.com/jazzband/django-oauth-toolkit/issues/634
# swappable models are badly designed in oauth2_provider # swappable models are badly designed in oauth2_provider
# ignore migrations and provide our own models. # ignore migrations and provide our own models.
"oauth2_provider": None "oauth2_provider": None,
"sites": "funkwhale_api.contrib.sites.migrations",
} }
# #