migrations: Add merge migration for backport of 0753.

Systems upgrading from 11.x will have 0753 and not 0752, while systems
upgrading from main may have 0752 and not 0753, so a merge migration
is required to smoothly handle upgrades from both states.
This commit is contained in:
Tim Abbott
2025-10-14 11:55:48 -07:00
parent 9ffe31e352
commit e4ba536eae
2 changed files with 13 additions and 1 deletions

View File

@@ -15,7 +15,7 @@ def remove_google_blob(apps: StateApps, schema_editor: BaseDatabaseSchemaEditor)
class Migration(migrations.Migration):
dependencies = [
("zerver", "0752_remove_stream_is_in_zephyr_realm"),
("zerver", "0751_externalauthid_zerver_user_externalauth_uniq"),
]
operations = [

View File

@@ -0,0 +1,12 @@
# Generated by Django 5.2.6 on 2025-10-14 18:55
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("zerver", "0752_remove_stream_is_in_zephyr_realm"),
("zerver", "0753_remove_google_blob_emojiset"),
]
operations = []