From cd71077c6acb52bf564ede19cf480fddfad72c05 Mon Sep 17 00:00:00 2001
From: ususdei <ususdei@users.noreply.github.com>
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
---
 templates/repo/issue/view_content.tmpl | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'templates')

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
@@ -195,6 +195,12 @@
 									<div class="ui divider"></div>
 									<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">
-- 
cgit v1.2.3