12 files changed, 38 insertions, 10 deletions
diff --git a/pydis_site/apps/api/migrations/0052_create_news_setting.py b/pydis_site/apps/api/migrations/0051_create_news_setting.py
index b101d19d..f18fdfb1 100644
--- a/pydis_site/apps/api/migrations/0052_create_news_setting.py
+++ b/pydis_site/apps/api/migrations/0051_create_news_setting.py
@@ -17,7 +17,7 @@ def down(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('api', '0051_allow_blank_message_embeds'),
+        ('api', '0050_remove_infractions_active_default_value'),
     ]
 
     operations = [
diff --git a/pydis_site/apps/api/migrations/0053_offtopicchannelname_used.py b/pydis_site/apps/api/migrations/0052_offtopicchannelname_used.py
index b51ce1d2..dfdf3835 100644
--- a/pydis_site/apps/api/migrations/0053_offtopicchannelname_used.py
+++ b/pydis_site/apps/api/migrations/0052_offtopicchannelname_used.py
@@ -6,7 +6,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('api', '0052_create_news_setting'),
+        ('api', '0051_create_news_setting'),
     ]
 
     operations = [
diff --git a/pydis_site/apps/api/migrations/0054_remove_user_avatar_hash.py b/pydis_site/apps/api/migrations/0052_remove_user_avatar_hash.py
index be9fd948..26b3b954 100644
--- a/pydis_site/apps/api/migrations/0054_remove_user_avatar_hash.py
+++ b/pydis_site/apps/api/migrations/0052_remove_user_avatar_hash.py
@@ -6,7 +6,7 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('api', '0053_offtopicchannelname_used'),
+        ('api', '0051_create_news_setting'),
     ]
 
     operations = [
diff --git a/pydis_site/apps/api/migrations/0055_user_roles_to_array.py b/pydis_site/apps/api/migrations/0053_user_roles_to_array.py
index e7b4a983..7ff3a548 100644
--- a/pydis_site/apps/api/migrations/0055_user_roles_to_array.py
+++ b/pydis_site/apps/api/migrations/0053_user_roles_to_array.py
@@ -8,7 +8,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('api', '0054_remove_user_avatar_hash'),
+        ('api', '0052_remove_user_avatar_hash'),
     ]
 
     operations = [
diff --git a/pydis_site/apps/api/migrations/0056_user_invalidate_unknown_role.py b/pydis_site/apps/api/migrations/0054_user_invalidate_unknown_role.py
index ab2696aa..96230015 100644
--- a/pydis_site/apps/api/migrations/0056_user_invalidate_unknown_role.py
+++ b/pydis_site/apps/api/migrations/0054_user_invalidate_unknown_role.py
@@ -9,7 +9,7 @@ import pydis_site.apps.api.models.bot.user
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('api', '0055_user_roles_to_array'),
+        ('api', '0053_user_roles_to_array'),
     ]
 
     operations = [
diff --git a/pydis_site/apps/api/migrations/0055_merge_20200714_2027.py b/pydis_site/apps/api/migrations/0055_merge_20200714_2027.py
new file mode 100644
index 00000000..f2a0e638
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0055_merge_20200714_2027.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.0.8 on 2020-07-14 20:27
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0051_allow_blank_message_embeds'),
+        ('api', '0054_user_invalidate_unknown_role'),
+    ]
+
+    operations = [
+    ]
diff --git a/pydis_site/apps/api/migrations/0057_reminder_mentions.py b/pydis_site/apps/api/migrations/0055_reminder_mentions.py
index fb829a17..d73b450d 100644
--- a/pydis_site/apps/api/migrations/0057_reminder_mentions.py
+++ b/pydis_site/apps/api/migrations/0055_reminder_mentions.py
@@ -8,7 +8,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('api', '0056_user_invalidate_unknown_role'),
+        ('api', '0054_user_invalidate_unknown_role'),
     ]
 
     operations = [
diff --git a/pydis_site/apps/api/migrations/0058_allow_blank_user_roles.py b/pydis_site/apps/api/migrations/0056_allow_blank_user_roles.py
index 8f7fddfc..489941c7 100644
--- a/pydis_site/apps/api/migrations/0058_allow_blank_user_roles.py
+++ b/pydis_site/apps/api/migrations/0056_allow_blank_user_roles.py
@@ -9,7 +9,7 @@ import pydis_site.apps.api.models.bot.user
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('api', '0057_reminder_mentions'),
+        ('api', '0055_merge_20200714_2027'),
     ]
 
     operations = [
diff --git a/pydis_site/apps/api/migrations/0057_merge_20200716_0751.py b/pydis_site/apps/api/migrations/0057_merge_20200716_0751.py
new file mode 100644
index 00000000..47a6d2d4
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0057_merge_20200716_0751.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.14 on 2020-07-16 07:51
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0055_reminder_mentions'),
+        ('api', '0056_allow_blank_user_roles'),
+    ]
+
+    operations = [
+    ]
diff --git a/pydis_site/apps/api/migrations/0059_create_new_filterlist_model.py b/pydis_site/apps/api/migrations/0058_create_new_filterlist_model.py
index eac5542d..aecfdad7 100644
--- a/pydis_site/apps/api/migrations/0059_create_new_filterlist_model.py
+++ b/pydis_site/apps/api/migrations/0058_create_new_filterlist_model.py
@@ -6,7 +6,7 @@ import pydis_site.apps.api.models.mixins
 
 class Migration(migrations.Migration):
     dependencies = [
-        ('api', '0058_allow_blank_user_roles'),
+        ('api', '0057_merge_20200716_0751'),
     ]
 
     operations = [
diff --git a/pydis_site/apps/api/migrations/0060_populate_filterlists.py b/pydis_site/apps/api/migrations/0059_populate_filterlists.py
index 35fde95a..8c550191 100644
--- a/pydis_site/apps/api/migrations/0060_populate_filterlists.py
+++ b/pydis_site/apps/api/migrations/0059_populate_filterlists.py
@@ -130,7 +130,7 @@ populate_data = {
 
 
 class Migration(migrations.Migration):
-    dependencies = [("api", "0059_create_new_filterlist_model")]
+    dependencies = [("api", "0058_create_new_filterlist_model")]
 
     def populate_filterlists(app, _):
         FilterList = app.get_model("api", "FilterList")
diff --git a/pydis_site/apps/api/migrations/0061_populate_filterlists_fix.py b/pydis_site/apps/api/migrations/0060_populate_filterlists_fix.py
index eaaafb38..53846f02 100644
--- a/pydis_site/apps/api/migrations/0061_populate_filterlists_fix.py
+++ b/pydis_site/apps/api/migrations/0060_populate_filterlists_fix.py
@@ -54,7 +54,7 @@ guild_invite_whitelist = [
 
 
 class Migration(migrations.Migration):
-    dependencies = [("api", "0060_populate_filterlists")]
+    dependencies = [("api", "0059_populate_filterlists")]
 
     def fix_filterlist(app, _):
         FilterList = app.get_model("api", "FilterList")