summaryrefslogtreecommitdiffstats
path: root/routers/repo/pull.go
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2015-09-02 11:13:37 -0400
committerUnknwon <u@gogs.io>2015-09-02 11:13:37 -0400
commit5da306c0e5a2939b836d5ec00a0984a2c30e0f9f (patch)
tree6b4632617336a3536fddbe31ad50aab9f389580e /routers/repo/pull.go
parentd951824ff9c52919e2821d0e9be2504550a994fc (diff)
downloadgitea-5da306c0e5a2939b836d5ec00a0984a2c30e0f9f.tar.gz
gitea-5da306c0e5a2939b836d5ec00a0984a2c30e0f9f.zip
tmp: fix issue open count
Diffstat (limited to 'routers/repo/pull.go')
-rw-r--r--routers/repo/pull.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index b55d928b61..caa651c621 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -381,7 +381,8 @@ func MergePullRequest(ctx *middleware.Context) {
}
pr.Pull = pull
- if err = pr.Merge(ctx.Repo.GitRepo); err != nil {
+ pr.Pull.Repo = ctx.Repo.Repository
+ if err = pr.Merge(ctx.User, ctx.Repo.GitRepo); err != nil {
ctx.Handle(500, "GetPullRequestByPullID", err)
return
}