diff options
| author | Unknwon <u@gogs.io> | 2015-10-18 17:18:45 -0400 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-10-18 17:18:54 -0400 |
| commit | 4dc6285715ccd1e90cb4e437a3c2b1d0b13d47cb (patch) | |
| tree | f6ba3ef13ecf8763739944faf4708488e5dcc3fa /routers/repo | |
| parent | 9825760817eab55708c0248a6cbd94376b7c7fe4 (diff) | |
| download | gitea-4dc6285715ccd1e90cb4e437a3c2b1d0b13d47cb.tar.gz gitea-4dc6285715ccd1e90cb4e437a3c2b1d0b13d47cb.zip | |
add new status: checking
Diffstat (limited to 'routers/repo')
| -rw-r--r-- | routers/repo/pull.go | 2 |
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 } |