mirror of
https://github.com/zulip/zulip.git
synced 2025-11-03 05:23:35 +00:00
zerver/migrations: Squash an AlterField from 0002 into 0001.
Squash the AlterField on UserProfile.groups in 0002 into the AddField in 0001. This is done to avoid a probable bug in Django, where running migrations in python 3 sometimes led to a KeyError.
This commit is contained in:
committed by
Tim Abbott
parent
05d36626e8
commit
d8de54abe5
@@ -491,7 +491,7 @@ CREATE TRIGGER zerver_message_update_search_tsvector_async
|
||||
migrations.AddField(
|
||||
model_name='userprofile',
|
||||
name='groups',
|
||||
field=models.ManyToManyField(related_query_name='user', related_name='user_set', to='auth.Group', blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of his/her group.', verbose_name='groups'),
|
||||
field=models.ManyToManyField(related_query_name='user', related_name='user_set', to='auth.Group', blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', verbose_name='groups'),
|
||||
preserve_default=True,
|
||||
),
|
||||
migrations.AddField(
|
||||
|
||||
@@ -53,11 +53,6 @@ class Migration(migrations.Migration):
|
||||
name='email',
|
||||
field=models.EmailField(unique=True, max_length=254, db_index=True),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='userprofile',
|
||||
name='groups',
|
||||
field=models.ManyToManyField(related_query_name='user', related_name='user_set', to='auth.Group', blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', verbose_name='groups'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='userprofile',
|
||||
name='last_login',
|
||||
|
||||
Reference in New Issue
Block a user