From e4ba536eae7ab54710209dbc26893f92495ea618 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Tue, 14 Oct 2025 11:55:48 -0700 Subject: [PATCH] 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. --- .../migrations/0753_remove_google_blob_emojiset.py | 2 +- zerver/migrations/0754_merge_20251014_1855.py | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 zerver/migrations/0754_merge_20251014_1855.py diff --git a/zerver/migrations/0753_remove_google_blob_emojiset.py b/zerver/migrations/0753_remove_google_blob_emojiset.py index 83118b7b3e..98b2899969 100644 --- a/zerver/migrations/0753_remove_google_blob_emojiset.py +++ b/zerver/migrations/0753_remove_google_blob_emojiset.py @@ -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 = [ diff --git a/zerver/migrations/0754_merge_20251014_1855.py b/zerver/migrations/0754_merge_20251014_1855.py new file mode 100644 index 0000000000..b4e9d41bcd --- /dev/null +++ b/zerver/migrations/0754_merge_20251014_1855.py @@ -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 = []