Squash migrations and upgrade Django to 2.1.4 (gitcoinco#3309)

chadf1472 · Dec 26, 2018 · 1f2a159 · 1f2a159
1 parent b2cc524
commit 1f2a159
Show file tree

Hide file tree

Showing 286 changed files with 887 additions and 7,324 deletions.
diff --git a/app/avatar/migrations/0001_initial.py b/app/avatar/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.0.6 on 2018-06-21 13:06
+# Generated by Django 2.1.4 on 2018-12-26 17:16
 
 import avatar.utils
 import django.contrib.postgres.fields.jsonb
@@ -20,13 +20,15 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('created_on', models.DateTimeField(db_index=True, default=economy.models.get_time)),
                 ('modified_on', models.DateTimeField(default=economy.models.get_time)),
-                ('config', django.contrib.postgres.fields.jsonb.JSONField(default=dict)),
-                ('png', models.ImageField(blank=True, null=True, upload_to=avatar.utils.get_upload_filename)),
-                ('svg', models.FileField(blank=True, null=True, upload_to=avatar.utils.get_upload_filename)),
+                ('config', django.contrib.postgres.fields.jsonb.JSONField(default=dict, help_text='The JSON configuration of the custom avatar.')),
+                ('github_svg', models.FileField(blank=True, help_text='The Github avatar SVG.', null=True, upload_to=avatar.utils.get_upload_filename)),
+                ('png', models.ImageField(blank=True, help_text='The Github avatar PNG.', null=True, upload_to=avatar.utils.get_upload_filename)),
+                ('custom_avatar_png', models.ImageField(blank=True, help_text='The custom avatar PNG.', null=True, upload_to=avatar.utils.get_upload_filename)),
+                ('svg', models.FileField(blank=True, help_text='The custom avatar SVG.', null=True, upload_to=avatar.utils.get_upload_filename)),
                 ('use_github_avatar', models.BooleanField(default=True)),
             ],
             options={
-                'abstract': False,
+                'verbose_name_plural': 'Avatars',
             },
         ),
     ]
diff --git a/app/avatar/migrations/0002_auto_20180627_0512.py b/app/avatar/migrations/0002_auto_20180627_0512.py
diff --git a/app/avatar/migrations/0003_auto_20180903_2005.py b/app/avatar/migrations/0003_auto_20180903_2005.py
diff --git a/app/bounty_requests/migrations/0001_initial.py b/app/bounty_requests/migrations/0001_initial.py
@@ -1,7 +1,7 @@
-# Generated by Django 2.1 on 2018-08-23 16:26
+# Generated by Django 2.1.4 on 2018-12-26 17:16
 
+import django.core.validators
 from django.db import migrations, models
-import django.db.models.deletion
 import economy.models
 
 
@@ -10,7 +10,6 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('dashboard', '0106_auto_20180823_1626'),
     ]
 
     operations = [
@@ -25,8 +24,19 @@ class Migration(migrations.Migration):
                 ('eth_address', models.CharField(blank=True, max_length=50)),
                 ('comment', models.TextField(default='', max_length=500)),
                 ('comment_admin', models.TextField(blank=True, max_length=500)),
-                ('amount', models.FloatField(default=0.0)),
-                ('requested_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='bounty_requests', to='dashboard.Profile')),
+                ('amount', models.FloatField(validators=[django.core.validators.MinValueValidator(1.0)])),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='BountyRequestMeta',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_on', models.DateTimeField(db_index=True, default=economy.models.get_time)),
+                ('modified_on', models.DateTimeField(default=economy.models.get_time)),
+                ('last_feedback_sent', models.DateTimeField()),
             ],
             options={
                 'abstract': False,

diff --git a/app/bounty_requests/migrations/0002_auto_20180824_2103.py b/app/bounty_requests/migrations/0002_auto_20180824_2103.py
diff --git a/app/bounty_requests/migrations/0002_auto_20181226_1716.py b/app/bounty_requests/migrations/0002_auto_20181226_1716.py
@@ -0,0 +1,27 @@
+# Generated by Django 2.1.4 on 2018-12-26 17:16
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('dashboard', '0001_initial'),
+        ('bounty_requests', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='bountyrequestmeta',
+            name='profile',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dashboard.Profile'),
+        ),
+        migrations.AddField(
+            model_name='bountyrequest',
+            name='requested_by',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='bounty_requests', to='dashboard.Profile'),
+        ),
+    ]
diff --git a/app/bounty_requests/migrations/0003_bountyrequestmeta.py b/app/bounty_requests/migrations/0003_bountyrequestmeta.py
diff --git a/app/cms/migrations/0001_initial.py b/app/cms/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.1 on 2018-08-31 09:03
+# Generated by Django 2.1.4 on 2018-12-26 17:16
 
 from django.db import migrations, models
 import django.db.models.deletion