From cd71077c6acb52bf564ede19cf480fddfad72c05 Mon Sep 17 00:00:00 2001 From: ususdei Date: Tue, 26 Jun 2018 14:49:46 +0200 Subject: pull request: able to add custom commit description (#5276) * pull request merges now allow for custom commit messages * allow i18n on commit_message label * place label above textarea for commit message * rename commit message for pull requests into commit description and pass to git separately --- routes/repo/pull.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'routes') 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 } -- cgit v1.2.3