mirror of
https://github.com/bookwyrm-social/bookwyrm.git
synced 2024-10-31 22:19:00 +00:00
Merge branch 'main' into production
This commit is contained in:
commit
78d358a916
2 changed files with 19 additions and 1 deletions
18
bookwyrm/migrations/0038_auto_20210118_1951.py
Normal file
18
bookwyrm/migrations/0038_auto_20210118_1951.py
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
# Generated by Django 3.0.7 on 2021-01-18 19:51
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('bookwyrm', '0037_auto_20210118_1900'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='user',
|
||||||
|
name='email',
|
||||||
|
field=models.EmailField(max_length=254, null=True, unique=True),
|
||||||
|
),
|
||||||
|
]
|
|
@ -25,7 +25,7 @@ from . import fields, Review
|
||||||
class User(OrderedCollectionPageMixin, AbstractUser):
|
class User(OrderedCollectionPageMixin, AbstractUser):
|
||||||
''' a user who wants to read books '''
|
''' a user who wants to read books '''
|
||||||
username = fields.UsernameField()
|
username = fields.UsernameField()
|
||||||
email = models.EmailField(unique=True)
|
email = models.EmailField(unique=True, null=True)
|
||||||
|
|
||||||
key_pair = fields.OneToOneField(
|
key_pair = fields.OneToOneField(
|
||||||
'KeyPair',
|
'KeyPair',
|
||||||
|
|
Loading…
Reference in a new issue