From 3662a6ded99abeb08b910baa27d5c879f3dd1792 Mon Sep 17 00:00:00 2001 From: Alex Vandiver Date: Mon, 6 May 2024 14:28:38 +0000 Subject: [PATCH] migrations: Merge 0517 as a no-op. Migration 0517 migration was already run as 0497 on `main`, but was accidentally omitted on 8.x until this point. Merge the 0517 migration into the migration history. It is included as a no-op in `main` because it has already run as 0497. --- zerver/migrations/0517_resort_edit_history.py | 15 +++++++++++++++ zerver/migrations/0518_merge.py | 12 ++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 zerver/migrations/0517_resort_edit_history.py create mode 100644 zerver/migrations/0518_merge.py diff --git a/zerver/migrations/0517_resort_edit_history.py b/zerver/migrations/0517_resort_edit_history.py new file mode 100644 index 0000000000..12ba3df438 --- /dev/null +++ b/zerver/migrations/0517_resort_edit_history.py @@ -0,0 +1,15 @@ +from django.db import migrations + +# This migration was already run as 0497 on `main`, but was +# accidentally omitted on 8.x until this point. This is left as a +# no-op on `main`, since it has either already run -- either as this +# migration number, if the user is upgrading from 8.x, or just now as +# 0497 if the user upgraded from a prior version. + + +class Migration(migrations.Migration): + dependencies = [ + ("zerver", "0501_delete_dangling_usermessages"), + ] + + operations = [] diff --git a/zerver/migrations/0518_merge.py b/zerver/migrations/0518_merge.py new file mode 100644 index 0000000000..17fafb2691 --- /dev/null +++ b/zerver/migrations/0518_merge.py @@ -0,0 +1,12 @@ +from django.db import migrations + +# See 0517 for the history of this migration merge commit. + + +class Migration(migrations.Migration): + dependencies = [ + ("zerver", "0516_fix_confirmation_preregistrationusers"), + ("zerver", "0517_resort_edit_history"), + ] + + operations = []