troldspejlet/forgejo
troldspejlet/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-10 20:59:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Restore reviewed-on message (#19657)

Browse source 
Regression from #18177
This commit is contained in:
Lunny Xiao 2022-05-09 03:13:27 +08:00 committed by GitHub
parent 4ca1d7547a
commit 290cc884f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
templates/repo/issue/view_content/pull.tmpl
View file

@ -377,6 +377,9 @@
<div class="field"> <div class="field">
<input type="text" name="merge_title_field" value="{{.DefaultMergeMessage}}"> <input type="text" name="merge_title_field" value="{{.DefaultMergeMessage}}">
</div> </div>
<div class="field">
<textarea name="merge_message_field" rows="5" placeholder="{{$.i18n.Tr "repo.editor.commit_message_desc"}}">Reviewed-on: {{$.Issue.HTMLURL}}&#13;&#10;{{$approvers}}</textarea>
</div>
<button class="ui green button" type="submit" name="do" value="rebase-merge"> <button class="ui green button" type="submit" name="do" value="rebase-merge">
{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}} {{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}}
</button> </button>