aboutsummaryrefslogtreecommitdiff
path: root/routes/repo/pull.go
diff options
context:
space:
mode:
Diffstat (limited to 'routes/repo/pull.go')
-rw-r--r--routes/repo/pull.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/routes/repo/pull.go b/routes/repo/pull.go
index 049cf368..58f0a49a 100644
--- a/routes/repo/pull.go
+++ b/routes/repo/pull.go
@@ -406,7 +406,7 @@ func MergePullRequest(c *context.Context) {
pr.Issue = issue
pr.Issue.Repo = c.Repo.Repository
- if err = pr.Merge(c.User, c.Repo.GitRepo, models.MergeStyle(c.Query("merge_style"))); err != nil {
+ if err = pr.Merge(c.User, c.Repo.GitRepo, models.MergeStyle(c.Query("merge_style")), c.Query("commit_description")); err != nil {
c.ServerError("Merge", err)
return
}