mirror of
https://github.com/go-gitea/gitea.git
synced 2026-10-23 19:47:07 +09:00
add new status: checking
This commit is contained in:
1 parent
9825760817
commit
4dc6285715
4 files changed
+19
-7
No files matched your search
@@ -374,7 +374,7 @@ func MergePullRequest(ctx *middleware.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
if !pr.CanAutoMerge || pr.HasMerged {
|
||||
if !pr.CanAutoMerge() || pr.HasMerged {
|
||||
ctx.Handle(404, "MergePullRequest", nil)
|
||||
return
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user