Fix cancel auto merge bug (#36341) (#36356)

Backport #36341 by @lunny Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2026-01-13 10:55:41 +08:00
parent 11891c2dac
commit f8ec5b3e43
3 changed files with 50 additions and 1 deletions
--- a/routers/api/v1/repo/pull.go
+++ b/routers/api/v1/repo/pull.go
@@ -1337,7 +1337,7 @@ func CancelScheduledAutoMerge(ctx *context.APIContext) {
 	}

 	if ctx.Doer.ID != autoMerge.DoerID {
-		allowed, err := access_model.IsUserRepoAdmin(ctx, ctx.Repo.Repository, ctx.Doer)
+		allowed, err := pull_service.IsUserAllowedToMerge(ctx, pull, ctx.Repo.Permission, ctx.Doer)
 		if err != nil {
 			ctx.APIErrorInternal(err)
 			return