merge of upstream/main + limitsize w/o DB

models/migrations/migrations.go

@@ -400,7 +400,6 @@ func prepareMigrationTasks() []*migration {
 		newMigration(323, "Add support for actions concurrency", v1_26.AddActionsConcurrency),
 		newMigration(324, "Fix closed milestone completeness for milestones with no issues", v1_26.FixClosedMilestoneCompleteness),
 		newMigration(325, "Fix missed repo_id when migrate attachments", v1_26.FixMissedRepoIDWhenMigrateAttachments),
-		newMigration(326, "Add support for repository size limit - SizeLimit and LFSSizeLimit columns to repository table", v1_26.AddSizeLimitOnRepo),
 	}
 	return preparedMigrations
 }

models/migrations/v1_26/v326.go

@@ -1,18 +0,0 @@
-// Copyright 2022 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package v1_26
-
-import (
-	"xorm.io/xorm"
-)
-
-func AddSizeLimitOnRepo(x *xorm.Engine) error {
-	type Repository struct {
-		ID           int64 `xorm:"pk autoincr"`
-		SizeLimit    int64 `xorm:"NOT NULL DEFAULT 0"`
-		LFSSizeLimit int64 `xorm:"NOT NULL DEFAULT 0"`
-	}
-
-	return x.Sync2(new(Repository))
-}