Merge remote-tracking branch 'upstream/main' into limit-repo-size

models/migrations/migrations.go

@@ -398,7 +398,9 @@ func prepareMigrationTasks() []*migration {
 		// Gitea 1.25.0 ends at migration ID number 322 (database version 323)
 
 		newMigration(323, "Add support for actions concurrency", v1_26.AddActionsConcurrency),
-		newMigration(324, "Add support for repository size limit - SizeLimit and LFSSizeLimit columns to repository table", v1_26.AddSizeLimitOnRepo),
+		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_21/v276.go

@@ -5,14 +5,10 @@ package v1_21
 
 import (
 	"context"
-	"fmt"
-	"path/filepath"
-	"strings"
 
-	"code.gitea.io/gitea/modules/git"
-	giturl "code.gitea.io/gitea/modules/git/url"
+	repo_model "code.gitea.io/gitea/models/repo"
+	"code.gitea.io/gitea/modules/gitrepo"
 	"code.gitea.io/gitea/modules/setting"
-	"code.gitea.io/gitea/modules/util"
 
 	"xorm.io/xorm"
 )
@@ -163,16 +159,13 @@ func migratePushMirrors(x *xorm.Engine) error {
 }
 
 func getRemoteAddress(ownerName, repoName, remoteName string) (string, error) {
-	repoPath := filepath.Join(setting.RepoRootPath, strings.ToLower(ownerName), strings.ToLower(repoName)+".git")
-	if exist, _ := util.IsExist(repoPath); !exist {
+	ctx := context.Background()
+	relativePath := repo_model.RelativePath(ownerName, repoName)
+	if exist, _ := gitrepo.IsRepositoryExist(ctx, repo_model.StorageRepo(relativePath)); !exist {
 		return "", nil
 	}
-	remoteURL, err := git.GetRemoteAddress(context.Background(), repoPath, remoteName)
-	if err != nil {
-		return "", fmt.Errorf("get remote %s's address of %s/%s failed: %v", remoteName, ownerName, repoName, err)
-	}
 
-	u, err := giturl.ParseGitURL(remoteURL)
+	u, err := gitrepo.GitRemoteGetURL(ctx, repo_model.StorageRepo(relativePath), remoteName)
 	if err != nil {
 		return "", err
 	}

models/migrations/v1_26/v324.go

@@ -1,18 +1,24 @@
-// Copyright 2022 The Gitea Authors. All rights reserved.
+// Copyright 2025 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package v1_26
 
 import (
+	"fmt"
+
 	"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"`
+func FixClosedMilestoneCompleteness(x *xorm.Engine) error {
+	// Update all milestones to recalculate completeness with the new logic:
+	// - Closed milestones with 0 issues should show 100%
+	// - All other milestones should calculate based on closed/total ratio
+	_, err := x.Exec("UPDATE `milestone` SET completeness=(CASE WHEN is_closed = ? AND num_issues = 0 THEN 100 ELSE 100*num_closed_issues/(CASE WHEN num_issues > 0 THEN num_issues ELSE 1 END) END)",
+		true,
+	)
+	if err != nil {
+		return fmt.Errorf("error updating milestone completeness: %w", err)
 	}
 
-	return x.Sync2(new(Repository))
+	return nil
 }

models/migrations/v1_26/v325.go

@@ -0,0 +1,18 @@
+// Copyright 2026 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package v1_26
+
+import (
+	"xorm.io/xorm"
+)
+
+func FixMissedRepoIDWhenMigrateAttachments(x *xorm.Engine) error {
+	_, err := x.Exec("UPDATE `attachment` SET `repo_id` = (SELECT `repo_id` FROM `issue` WHERE `issue`.`id` = `attachment`.`issue_id`) WHERE `issue_id` > 0 AND (`repo_id` IS NULL OR `repo_id` = 0);")
+	if err != nil {
+		return err
+	}
+
+	_, err = x.Exec("UPDATE `attachment` SET `repo_id` = (SELECT `repo_id` FROM `release` WHERE `release`.`id` = `attachment`.`release_id`) WHERE `release_id` > 0 AND (`repo_id` IS NULL OR `repo_id` = 0);")
+	return err
+}

models/migrations/v1_26/v325_test.go

@@ -0,0 +1,45 @@
+// Copyright 2026 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package v1_26
+
+import (
+	"testing"
+
+	"code.gitea.io/gitea/models/migrations/base"
+	"code.gitea.io/gitea/modules/timeutil"
+
+	"github.com/stretchr/testify/require"
+)
+
+func Test_FixMissedRepoIDWhenMigrateAttachments(t *testing.T) {
+	type Attachment struct {
+		ID            int64  `xorm:"pk autoincr"`
+		UUID          string `xorm:"uuid UNIQUE"`
+		RepoID        int64  `xorm:"INDEX"`           // this should not be zero
+		IssueID       int64  `xorm:"INDEX"`           // maybe zero when creating
+		ReleaseID     int64  `xorm:"INDEX"`           // maybe zero when creating
+		UploaderID    int64  `xorm:"INDEX DEFAULT 0"` // Notice: will be zero before this column added
+		CommentID     int64  `xorm:"INDEX"`
+		Name          string
+		DownloadCount int64              `xorm:"DEFAULT 0"`
+		Size          int64              `xorm:"DEFAULT 0"`
+		CreatedUnix   timeutil.TimeStamp `xorm:"created"`
+	}
+
+	type Issue struct {
+		ID     int64 `xorm:"pk autoincr"`
+		RepoID int64 `xorm:"INDEX"`
+	}
+
+	type Release struct {
+		ID     int64 `xorm:"pk autoincr"`
+		RepoID int64 `xorm:"INDEX"`
+	}
+
+	// Prepare and load the testing database
+	x, deferrable := base.PrepareTestEnv(t, 0, new(Attachment), new(Issue), new(Release))
+	defer deferrable()
+
+	require.NoError(t, FixMissedRepoIDWhenMigrateAttachments(x))
+}

models/migrations/v1_26/v326.go

@@ -0,0 +1,18 @@
+// 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))
+}

models/migrations/v1_9/v82.go

@@ -6,11 +6,10 @@ package v1_9
 import (
 	"context"
 	"fmt"
-	"path/filepath"
-	"strings"
 
+	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/modules/git"
-	"code.gitea.io/gitea/modules/setting"
+	"code.gitea.io/gitea/modules/gitrepo"
 
 	"xorm.io/xorm"
 )
@@ -34,16 +33,6 @@ func FixReleaseSha1OnReleaseTable(ctx context.Context, x *xorm.Engine) error {
 		Name string
 	}
 
-	// UserPath returns the path absolute path of user repositories.
-	UserPath := func(userName string) string {
-		return filepath.Join(setting.RepoRootPath, strings.ToLower(userName))
-	}
-
-	// RepoPath returns repository path by given user and repository name.
-	RepoPath := func(userName, repoName string) string {
-		return filepath.Join(UserPath(userName), strings.ToLower(repoName)+".git")
-	}
-
 	// Update release sha1
 	const batchSize = 100
 	sess := x.NewSession()
@@ -99,7 +88,7 @@ func FixReleaseSha1OnReleaseTable(ctx context.Context, x *xorm.Engine) error {
 					userCache[repo.OwnerID] = user
 				}
 
-				gitRepo, err = git.OpenRepository(ctx, RepoPath(user.Name, repo.Name))
+				gitRepo, err = gitrepo.OpenRepository(ctx, repo_model.StorageRepo(repo_model.RelativePath(user.Name, repo.Name)))
 				if err != nil {
 					return err
 				}