diff options
| -rw-r--r-- | conf/locale/locale_en-US.ini | 1 | ||||
| -rw-r--r-- | models/pull.go | 5 | ||||
| -rw-r--r-- | routes/repo/pull.go | 2 | ||||
| -rw-r--r-- | templates/repo/issue/view_content.tmpl | 6 |
4 files changed, 11 insertions, 3 deletions
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index c17e2cac..c30d4454 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -640,6 +640,7 @@ pulls.cannot_auto_merge_desc = This pull request can't be merged automatically b pulls.cannot_auto_merge_helper = Please merge manually in order to resolve the conflicts. pulls.create_merge_commit = Create a merge commit pulls.rebase_before_merging = Rebase before merging +pulls.commit_description = Commit Description pulls.merge_pull_request = Merge Pull Request pulls.open_unmerged_pull_exists = `You can't perform reopen operation because there is already an open pull request (#%d) from same repository with same merge information and is waiting for merging.` pulls.delete_branch = Delete Branch diff --git a/models/pull.go b/models/pull.go index 43211ed7..1d54d082 100644 --- a/models/pull.go +++ b/models/pull.go @@ -193,7 +193,7 @@ const ( // Merge merges pull request to base repository. // FIXME: add repoWorkingPull make sure two merges does not happen at same time. -func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle MergeStyle) (err error) { +func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle MergeStyle, CommitDescription string) (err error) { defer func() { go HookQueue.Add(pr.BaseRepo.ID) go AddTestPullRequestTask(doer, pr.BaseRepo.ID, pr.BaseBranch, false) @@ -266,7 +266,8 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle if _, stderr, err = process.ExecDir(-1, tmpBasePath, fmt.Sprintf("PullRequest.Merge (git merge): %s", tmpBasePath), "git", "commit", fmt.Sprintf("--author='%s <%s>'", sig.Name, sig.Email), - "-m", fmt.Sprintf("Merge branch '%s' of %s/%s into %s", pr.HeadBranch, pr.HeadUserName, pr.HeadRepo.Name, pr.BaseBranch)); err != nil { + "-m", fmt.Sprintf("Merge branch '%s' of %s/%s into %s", pr.HeadBranch, pr.HeadUserName, pr.HeadRepo.Name, pr.BaseBranch), + "-m", CommitDescription); err != nil { return fmt.Errorf("git commit [%s]: %v - %s", tmpBasePath, err, stderr) } 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 } diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index c03b6973..1d499985 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -196,6 +196,12 @@ <form class="ui form" action="{{.Link}}/merge" method="post"> {{.CSRFTokenHTML}} <div class="field"> + <div class="ui top"> + <label>{{$.i18n.Tr "repo.pulls.commit_description"}}:</label> + <textarea id="commit_description" class="edit_area" name="commit_description" tabindex="4"></textarea> + </div> + </div> + <div class="field"> <div class="ui radio checkbox"> <input type="radio" name="merge_style" value="create_merge_commit" checked="checked"> <label>{{$.i18n.Tr "repo.pulls.create_merge_commit"}}</label> |