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 /templates | |
| 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 'templates')
| -rw-r--r-- | templates/repo/issue/view_content.tmpl | 6 |
1 files changed, 6 insertions, 0 deletions
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> |