From ec1c0f26bfbd7f2b3769ab37e02c3d31b3f16b4c Mon Sep 17 00:00:00 2001
From: Akarys42 <Akarys42@users.noreply.github.com>
Date: Thu, 7 Nov 2019 18:55:59 +0100
Subject: Squash down migration files

---
 .../apps/api/migrations/0046_offensivemessage.py   | 25 ----------------------
 .../api/migrations/0047_merge_20191025_1920.py     | 14 ------------
 .../apps/api/migrations/0047_offensivemessage.py   | 25 ++++++++++++++++++++++
 .../apps/api/migrations/0048_auto_20191025_1921.py | 19 ----------------
 4 files changed, 25 insertions(+), 58 deletions(-)
 delete mode 100644 pydis_site/apps/api/migrations/0046_offensivemessage.py
 delete mode 100644 pydis_site/apps/api/migrations/0047_merge_20191025_1920.py
 create mode 100644 pydis_site/apps/api/migrations/0047_offensivemessage.py
 delete mode 100644 pydis_site/apps/api/migrations/0048_auto_20191025_1921.py

(limited to 'pydis_site')

diff --git a/pydis_site/apps/api/migrations/0046_offensivemessage.py b/pydis_site/apps/api/migrations/0046_offensivemessage.py
deleted file mode 100644
index 0ce65946..00000000
--- a/pydis_site/apps/api/migrations/0046_offensivemessage.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# Generated by Django 2.2.6 on 2019-10-24 17:57
-
-import django.core.validators
-from django.db import migrations, models
-import pydis_site.apps.api.models.bot.offensive_message
-import pydis_site.apps.api.models.utils
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0045_add_plural_name_for_log_entry'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='OffensiveMessage',
-            fields=[
-                ('id', models.BigIntegerField(help_text='The message ID as taken from Discord.', primary_key=True, serialize=False, validators=[django.core.validators.MinValueValidator(limit_value=0, message='Message IDs cannot be negative.')])),
-                ('channel_id', models.BigIntegerField(help_text='The channel ID that the message was sent in, taken from Discord.', validators=[django.core.validators.MinValueValidator(limit_value=0, message='Channel IDs cannot be negative.')])),
-                ('delete_date', models.DateField(help_text='The date on which the message will be auto-deleted.', validators=[pydis_site.apps.api.models.bot.offensive_message.future_date_validator])),
-            ],
-            bases=(pydis_site.apps.api.models.utils.ModelReprMixin, models.Model),
-        ),
-    ]
diff --git a/pydis_site/apps/api/migrations/0047_merge_20191025_1920.py b/pydis_site/apps/api/migrations/0047_merge_20191025_1920.py
deleted file mode 100644
index f70fe24f..00000000
--- a/pydis_site/apps/api/migrations/0047_merge_20191025_1920.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Generated by Django 2.2.6 on 2019-10-25 17:20
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0046_reminder_jump_url'),
-        ('api', '0046_offensivemessage'),
-    ]
-
-    operations = [
-    ]
diff --git a/pydis_site/apps/api/migrations/0047_offensivemessage.py b/pydis_site/apps/api/migrations/0047_offensivemessage.py
new file mode 100644
index 00000000..f2068c1b
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0047_offensivemessage.py
@@ -0,0 +1,25 @@
+# Generated by Django 2.2.6 on 2019-11-07 17:55
+
+import django.core.validators
+from django.db import migrations, models
+import pydis_site.apps.api.models.bot.offensive_message
+import pydis_site.apps.api.models.utils
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0046_reminder_jump_url'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='OffensiveMessage',
+            fields=[
+                ('id', models.BigIntegerField(help_text='The message ID as taken from Discord.', primary_key=True, serialize=False, validators=[django.core.validators.MinValueValidator(limit_value=0, message='Message IDs cannot be negative.')])),
+                ('channel_id', models.BigIntegerField(help_text='The channel ID that the message was sent in, taken from Discord.', validators=[django.core.validators.MinValueValidator(limit_value=0, message='Channel IDs cannot be negative.')])),
+                ('delete_date', models.DateTimeField(help_text='The date on which the message will be auto-deleted.', validators=[pydis_site.apps.api.models.bot.offensive_message.future_date_validator])),
+            ],
+            bases=(pydis_site.apps.api.models.utils.ModelReprMixin, models.Model),
+        ),
+    ]
diff --git a/pydis_site/apps/api/migrations/0048_auto_20191025_1921.py b/pydis_site/apps/api/migrations/0048_auto_20191025_1921.py
deleted file mode 100644
index 2e5e670a..00000000
--- a/pydis_site/apps/api/migrations/0048_auto_20191025_1921.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 2.2.6 on 2019-10-25 17:21
-
-from django.db import migrations, models
-import pydis_site.apps.api.models.bot.offensive_message
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0047_merge_20191025_1920'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='offensivemessage',
-            name='delete_date',
-            field=models.DateTimeField(help_text='The date on which the message will be auto-deleted.', validators=[pydis_site.apps.api.models.bot.offensive_message.future_date_validator]),
-        ),
-    ]
-- 
cgit v1.2.3