Merge branch '138-import-unicode' into 'develop'

Resolve "Importer chokes on files with bad unicode characters"

Closes #138 and #120

See merge request funkwhale/funkwhale!108
This commit is contained in:
Eliot Berriot 2018-03-25 13:46:26 +00:00
commit f36a9e2ac9
8 changed files with 74 additions and 15 deletions

View file

@ -231,6 +231,7 @@ STATIC_ROOT = env("STATIC_ROOT", default=str(ROOT_DIR('staticfiles')))
# See: https://docs.djangoproject.com/en/dev/ref/settings/#static-url
STATIC_URL = env("STATIC_URL", default='/staticfiles/')
DEFAULT_FILE_STORAGE = 'funkwhale_api.common.storage.ASCIIFileSystemStorage'
# See: https://docs.djangoproject.com/en/dev/ref/contrib/staticfiles/#std:setting-STATICFILES_DIRS
STATICFILES_DIRS = (