From 4dc6285715ccd1e90cb4e437a3c2b1d0b13d47cb Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Sun, 18 Oct 2015 17:18:45 -0400
Subject: add new status: checking

---
 routers/repo/pull.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'routers/repo/pull.go')

diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index 40c83351..13236a21 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
 	}
-- 
cgit v1.2.3