public/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-04-26 10:04:29 +09:00
Code Issues Packages Projects Releases Wiki Activity

add new status: checking

Browse Source
This commit is contained in:
Unknwon
2015-10-18 17:18:45 -04:00
parent 9825760817
commit 4dc6285715
4 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
routers/repo/pull.go
View File

@@ -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
}