summaryrefslogtreecommitdiffstats
path: root/routers/repo
diff options
context:
space:
mode:
Diffstat (limited to 'routers/repo')
-rw-r--r--routers/repo/pull.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index 40c83351ca..13236a219f 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -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
}