diff options
| author | Unknwon <u@gogs.io> | 2018-06-26 21:16:29 +0800 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2018-06-26 21:16:29 +0800 |
| commit | f6bdefe3f3937e1434b9692822e0ff6f599df758 (patch) | |
| tree | 88e39cec24a63fb147886ecb715b1c3c684f3f0d /templates/repo/issue | |
| parent | cd71077c6acb52bf564ede19cf480fddfad72c05 (diff) | |
public: minor fix for PR #5276
Diffstat (limited to 'templates/repo/issue')
| -rw-r--r-- | templates/repo/issue/view_content.tmpl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 1d499985..8c221f51 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -196,12 +196,6 @@ <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> @@ -215,6 +209,12 @@ </div> </div> {{end}} + <div class="commit description field"> + <div class="ui top"> + <p>{{$.i18n.Tr "repo.pulls.commit_description"}}:</p> + <textarea id="commit_description" name="commit_description" tabindex="4" rows="3"></textarea> + </div> + </div> <button class="ui green button"> <span class="octicon octicon-git-merge"></span> {{$.i18n.Tr "repo.pulls.merge_pull_request"}} </button> |