From 7c18a45f86fee4e5967add8cd3a98fddf672fef9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=98=99=E2=97=A6=20The=20Tablet=20=E2=9D=80=20GamerGirla?=
 =?UTF-8?q?ndCo=20=E2=97=A6=E2=9D=A7?= <i.am.the.tablet@proton.me>
Date: Thu, 2 Apr 2026 19:25:35 -0400
Subject: [PATCH] fix compilation errors after rebase

---
 models/migrations/v1_21/v276.go       | 2 +-
 models/migrations/v1_9/v82.go         | 2 +-
 routers/api/v1/group/group.go         | 2 +-
 routers/web/shared/actions/general.go | 2 +-
 routers/web/shared/actions/runners.go | 2 ++
 services/group/search.go              | 2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/models/migrations/v1_21/v276.go b/models/migrations/v1_21/v276.go
index be24b31902..a4cbee13d3 100644
--- a/models/migrations/v1_21/v276.go
+++ b/models/migrations/v1_21/v276.go
@@ -160,7 +160,7 @@ func migratePushMirrors(x *xorm.Engine) error {
 
 func getRemoteAddress(ownerName, repoName, remoteName string) (string, error) {
 	ctx := context.Background()
-	relativePath := repo_model.RelativePath(ownerName, repoName)
+	relativePath := repo_model.RelativePath(ownerName, repoName, 0)
 	if exist, _ := gitrepo.IsRepositoryExist(ctx, repo_model.StorageRepo(relativePath)); !exist {
 		return "", nil
 	}
diff --git a/models/migrations/v1_9/v82.go b/models/migrations/v1_9/v82.go
index 8796b0563d..3950d61b6d 100644
--- a/models/migrations/v1_9/v82.go
+++ b/models/migrations/v1_9/v82.go
@@ -88,7 +88,7 @@ func FixReleaseSha1OnReleaseTable(ctx context.Context, x *xorm.Engine) error {
 					userCache[repo.OwnerID] = user
 				}
 
-				gitRepo, err = gitrepo.OpenRepository(ctx, repo_model.StorageRepo(repo_model.RelativePath(user.Name, repo.Name)))
+				gitRepo, err = gitrepo.OpenRepository(ctx, repo_model.StorageRepo(repo_model.RelativePath(user.Name, repo.Name, 0)))
 				if err != nil {
 					return err
 				}
diff --git a/routers/api/v1/group/group.go b/routers/api/v1/group/group.go
index abcb33d53c..eda16eee1b 100644
--- a/routers/api/v1/group/group.go
+++ b/routers/api/v1/group/group.go
@@ -357,7 +357,7 @@ func GetGroupRepos(ctx *context.APIContext) {
 	}
 	repos := make([]*api.Repository, len(groupRepos))
 	for i, repo := range groupRepos {
-		permission, err := access_model.GetUserRepoPermission(ctx, repo, ctx.Doer)
+		permission, err := access_model.GetIndividualUserRepoPermission(ctx, repo, ctx.Doer)
 		if err != nil {
 			ctx.APIErrorInternal(err)
 			return
diff --git a/routers/web/shared/actions/general.go b/routers/web/shared/actions/general.go
index 8a924f6e1f..9fbe211954 100644
--- a/routers/web/shared/actions/general.go
+++ b/routers/web/shared/actions/general.go
@@ -118,7 +118,7 @@ func UpdateGeneralSettings(ctx *context.Context) {
 	if ctx.FormBool("cross_repo_add_target") {
 		targetRepoName := ctx.FormString("cross_repo_add_target_name")
 		if targetRepoName != "" {
-			targetRepo, err := repo_model.GetRepositoryByName(ctx, rCtx.OwnerID, targetRepoName)
+			targetRepo, err := repo_model.GetRepositoryByName(ctx, rCtx.OwnerID, rCtx.GroupID, targetRepoName)
 			if err != nil {
 				if repo_model.IsErrRepoNotExist(err) {
 					ctx.JSONError("Repository doesn't exist")
diff --git a/routers/web/shared/actions/runners.go b/routers/web/shared/actions/runners.go
index 3609258440..9fbf9ab744 100644
--- a/routers/web/shared/actions/runners.go
+++ b/routers/web/shared/actions/runners.go
@@ -36,6 +36,7 @@ const (
 type runnersCtx struct {
 	OwnerID            int64
 	RepoID             int64
+	GroupID            int64
 	IsRepo             bool
 	IsOrg              bool
 	IsAdmin            bool
@@ -49,6 +50,7 @@ func getRunnersCtx(ctx *context.Context) (*runnersCtx, error) {
 	if ctx.Data["PageIsRepoSettings"] == true {
 		return &runnersCtx{
 			RepoID:             ctx.Repo.Repository.ID,
+			GroupID:            ctx.Repo.Repository.GroupID,
 			OwnerID:            0,
 			IsRepo:             true,
 			RunnersTemplate:    tplRepoRunners,
diff --git a/services/group/search.go b/services/group/search.go
index 5194c7394c..cc81b9f5c5 100644
--- a/services/group/search.go
+++ b/services/group/search.go
@@ -94,7 +94,7 @@ func (w *WebSearchGroup) doLoadChildren(opts *WebSearchOptions) error {
 	slices.SortStableFunc(repos, func(a, b *repo_model.Repository) int {
 		return a.GroupSortOrder - b.GroupSortOrder
 	})
-	latestCommitStatuses, err := commitstatus_service.FindReposLastestCommitStatuses(opts.Ctx, repos)
+	latestCommitStatuses, err := commitstatus_service.FindReposLatestCommitStatuses(opts.Ctx, repos)
 	if err != nil {
 		log.Error("FindReposLastestCommitStatuses: %v", err)
 		return err