Merge remote-tracking branch 'origin/dev' into dev

apps/user/migrations/0004_auto_20180129_1259.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.0.1 on 2018-01-29 12:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user', '0003_auto_20180129_0624'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='fb_id',
+            field=models.BigIntegerField(blank=True, null=True, unique=True),
+        ),
+    ]

apps/user/models.py

@@ -27,7 +27,7 @@ class User(AbstractUser):
     pinterest = models.URLField(default='', null=True, blank=True)
     youtube = models.URLField(default='', null=True, blank=True)
     vkontakte = models.URLField('ВКонтакте', default='', null=True, blank=True)
-    fb_id = models.PositiveIntegerField(null=True, blank=True, unique=True)
+    fb_id = models.BigIntegerField(null=True, blank=True, unique=True)
     fb_data = pgfields.JSONField(default={}, null=True, blank=True)
     is_email_proved = models.BooleanField('Верифицирован по email', default=False)
     photo = models.ImageField('Фото', null=True, blank=True, upload_to='users')