合并部分migrations

account/migrations/0003_userprofile_total_score.py

@@ -22,4 +22,8 @@ class Migration(migrations.Migration):
             old_name='accepted_problem_number',
             new_name='accepted_number',
         ),
+        migrations.RemoveField(
+            model_name='userprofile',
+            name='time_zone',
+        )
     ]

account/migrations/0004_remove_userprofile_time_zone.py

@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.6 on 2017-08-23 09:04
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('account', '0003_userprofile_total_score'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='userprofile',
-            name='time_zone',
-        ),
-    ]

account/migrations/0005_auto_20170830_1154.py

@@ -9,7 +9,7 @@ import jsonfield.fields
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('account', '0004_remove_userprofile_time_zone'),
+        ('account', '0003_userprofile_total_score'),
     ]
 
     operations = [

account/migrations/0006_user_session_keys.py

@@ -2,7 +2,7 @@
 # Generated by Django 1.11.4 on 2017-09-16 06:22
 from __future__ import unicode_literals
 
-from django.db import migrations
+from django.db import migrations, models
 import jsonfield.fields
 
 
@@ -18,4 +18,19 @@ class Migration(migrations.Migration):
             name='session_keys',
             field=jsonfield.fields.JSONField(default=[]),
         ),
+        migrations.RenameField(
+            model_name='userprofile',
+            old_name='phone_number',
+            new_name='github',
+        ),
+        migrations.AlterField(
+            model_name='userprofile',
+            name='avatar',
+            field=models.CharField(default='/static/avatar/default.png', max_length=50),
+        ),
+        migrations.AlterField(
+            model_name='userprofile',
+            name='github',
+            field=models.CharField(blank=True, max_length=50, null=True),
+        ),
     ]

account/migrations/0007_auto_20170920_0254.py

@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2017-09-20 02:54
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('account', '0006_user_session_keys'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='userprofile',
-            old_name='phone_number',
-            new_name='github',
-        ),
-        migrations.AlterField(
-            model_name='userprofile',
-            name='avatar',
-            field=models.CharField(default='/static/avatar/default.png', max_length=50),
-        ),
-        migrations.AlterField(
-            model_name='userprofile',
-            name='github',
-            field=models.CharField(blank=True, max_length=50, null=True),
-        ),
-    ]

account/migrations/0008_auto_20171011_1214.py

@@ -9,7 +9,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('account', '0007_auto_20170920_0254'),
+        ('account', '0006_user_session_keys'),
     ]
 
     operations = [