From c3bf46e486241fa9e46f045e93c890b689bf2dce Mon Sep 17 00:00:00 2001
From: yp05327 <576951401@qq.com>
Date: Fri, 21 Jul 2023 00:26:13 +0000
Subject: [PATCH 1/6] fix

---
 models/migrations/migrations.go |  2 ++
 models/migrations/v1_21/v267.go | 12 ++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 models/migrations/v1_21/v267.go

diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index 6599cb9cda3e..c5c39f12d143 100644
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -515,6 +515,8 @@ var migrations = []Migration{
 	NewMigration("Alter Actions Artifact table", v1_21.AlterActionArtifactTable),
 	// v266 -> v267
 	NewMigration("Reduce commit status", v1_21.ReduceCommitStatus),
+	// v267 -> v268
+	NewMigration("Drop deleted branch table", v1_21.DropDeletedBranchTable),
 }
 
 // GetCurrentDBVersion returns the current db version
diff --git a/models/migrations/v1_21/v267.go b/models/migrations/v1_21/v267.go
new file mode 100644
index 000000000000..475ec023804e
--- /dev/null
+++ b/models/migrations/v1_21/v267.go
@@ -0,0 +1,12 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package v1_21 //nolint
+
+import (
+	"xorm.io/xorm"
+)
+
+func DropDeletedBranchTable(x *xorm.Engine) error {
+	return x.DropTables("deleted_branch")
+}

From 21fcb47618de3304eb9eba28caf0e256360866b9 Mon Sep 17 00:00:00 2001
From: yp05327 <576951401@qq.com>
Date: Fri, 21 Jul 2023 04:18:48 +0000
Subject: [PATCH 2/6] improve

---
 models/migrations/v1_21/v264.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/models/migrations/v1_21/v264.go b/models/migrations/v1_21/v264.go
index 60b7a7acf7d0..e81a17ad6d1b 100644
--- a/models/migrations/v1_21/v264.go
+++ b/models/migrations/v1_21/v264.go
@@ -89,5 +89,5 @@ func AddBranchTable(x *xorm.Engine) error {
 		}
 	}
 
-	return x.DropTables("deleted_branches")
+	return x.DropTables(new(DeletedBranch))
 }

From 1fff43b3fbba5d941ba9e3078d90f4fe2de52bcf Mon Sep 17 00:00:00 2001
From: yp05327 <576951401@qq.com>
Date: Mon, 24 Jul 2023 06:56:58 +0000
Subject: [PATCH 3/6] rename to v268

---
 models/migrations/v1_21/{v267.go => v268.go} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename models/migrations/v1_21/{v267.go => v268.go} (100%)

diff --git a/models/migrations/v1_21/v267.go b/models/migrations/v1_21/v268.go
similarity index 100%
rename from models/migrations/v1_21/v267.go
rename to models/migrations/v1_21/v268.go

From 97f81f7ced4e80cc725df4394ae8f5469b3c5755 Mon Sep 17 00:00:00 2001
From: yp05327 <576951401@qq.com>
Date: Tue, 25 Jul 2023 02:08:01 +0000
Subject: [PATCH 4/6] fix lint

---
 models/migrations/migrations.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index 32ecfbd1a54c..148ef1c13b7f 100644
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -517,8 +517,8 @@ var migrations = []Migration{
 	NewMigration("Reduce commit status", v1_21.ReduceCommitStatus),
 	// v267 -> v268
 	NewMigration("Add action_tasks_version table", v1_21.CreateActionTasksVersionTable),
-    // v268 -> v269
-    NewMigration("Drop deleted branch table", v1_21.DropDeletedBranchTable),
+	// v268 -> v269
+	NewMigration("Drop deleted branch table", v1_21.DropDeletedBranchTable),
 }
 
 // GetCurrentDBVersion returns the current db version

From d445f71ae6a8430233a57cdf97df023077e6d04f Mon Sep 17 00:00:00 2001
From: yp05327 <576951401@qq.com>
Date: Tue, 25 Jul 2023 23:46:45 +0000
Subject: [PATCH 5/6] rename to v269

---
 models/migrations/v1_21/{v268.go => v269.go} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename models/migrations/v1_21/{v268.go => v269.go} (100%)

diff --git a/models/migrations/v1_21/v268.go b/models/migrations/v1_21/v269.go
similarity index 100%
rename from models/migrations/v1_21/v268.go
rename to models/migrations/v1_21/v269.go

From 047e104b6060b39da5c961b39ac87cfb9c0e9943 Mon Sep 17 00:00:00 2001
From: yp05327 <576951401@qq.com>
Date: Tue, 25 Jul 2023 23:47:55 +0000
Subject: [PATCH 6/6] fix version

---
 models/migrations/migrations.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index 27d321ae8348..2b090a913238 100644
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -519,8 +519,8 @@ var migrations = []Migration{
 	NewMigration("Add action_tasks_version table", v1_21.CreateActionTasksVersionTable),
 	// v268 -> v269
 	NewMigration("Update Action Ref", v1_21.UpdateActionsRefIndex),
-    // v268 -> v269
-    NewMigration("Drop deleted branch table", v1_21.DropDeletedBranchTable),
+	// v269 -> v270
+	NewMigration("Drop deleted branch table", v1_21.DropDeletedBranchTable),
 }
 
 // GetCurrentDBVersion returns the current db version