mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-12-14 04:06:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into production

Browse source
This commit is contained in:
Mouse Reeve 2020-10-30 13:11:37 -07:00
commit 7af3afe24b
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
bookwyrm/migrations/0060_auto_20201030_2010.py Normal file
View file

@ -0,0 +1,19 @@
# Generated by Django 3.0.7 on 2020-10-30 20:10
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('bookwyrm', '0059_auto_20201030_1755'),
]
operations = [
migrations.AlterField(
model_name='user',
name='federated_server',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.FederatedServer'),
),
]

1
bookwyrm/models/user.py
View file

@ -24,6 +24,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
'FederatedServer', 'FederatedServer',
on_delete=models.PROTECT, on_delete=models.PROTECT,
null=True, null=True,
blank=True,
) )
outbox = models.CharField(max_length=255, unique=True) outbox = models.CharField(max_length=255, unique=True)
summary = models.TextField(blank=True, null=True) summary = models.TextField(blank=True, null=True)