Merge branch 'release/0.17'

api/funkwhale_api/music/migrations/0028_importjob_replace_if_duplicate.py

@@ -5,14 +5,12 @@ from django.db import migrations, models
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('music', '0027_auto_20180515_1808'),
-    ]
+    dependencies = [("music", "0027_auto_20180515_1808")]
 
     operations = [
         migrations.AddField(
-            model_name='importjob',
-            name='replace_if_duplicate',
+            model_name="importjob",
+            name="replace_if_duplicate",
             field=models.BooleanField(default=False),
-        ),
+        )
     ]

api/funkwhale_api/music/signals.py

+import django.dispatch
+
+upload_import_status_updated = django.dispatch.Signal(
+    providing_args=["old_status", "new_status", "upload"]
+)

api/funkwhale_api/playlists/admin.py

-from django.contrib import admin
+from funkwhale_api.common import admin
 
 from . import models