diff options
| author | ususdei <ususdei@users.noreply.github.com> | 2018-06-26 14:49:46 +0200 |
|---|---|---|
| committer | 无闻 <u@gogs.io> | 2018-06-26 20:49:46 +0800 |
| commit | cd71077c6acb52bf564ede19cf480fddfad72c05 (patch) | |
| tree | 20f4f65d9eb219c1ed30902d3628d0f3269bafa9 /routes/repo/pull.go | |
| parent | 029b33c6508b9f320300e68e38184b2eb17ee1d5 (diff) | |
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
Diffstat (limited to 'routes/repo/pull.go')
| -rw-r--r-- | routes/repo/pull.go | 2 |
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 } |