Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-08-06 01:44:24 +02:00
Code Issues Activity

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

Browse Source 
Backport #36341 by @lunny

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
Giteabot
2026-01-12 18:55:41 -08:00
committed by GitHub
co-authored by Lunny Xiao
parent 11891c2dac
commit f8ec5b3e43
3 changed files with 50 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
routers/api/v1/repo/pull.go
+1 -1
View File
@@ -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