Bo-Yi Wu
zeripath
5 years ago
1 changed files with 3 additions and 3 deletions
Unified View
Diff Options
+ 3
- 3
templates/repo/issue/view_content/pull.tmpl
View File
| @@ -153,7 +153,7 @@ | |||||
| <input type="text" name="merge_title_field" value="{{.Issue.PullRequest.GetDefaultMergeMessage}}"> | <input type="text" name="merge_title_field" value="{{.Issue.PullRequest.GetDefaultMergeMessage}}"> | ||||
| </div> | </div> | ||||
| <div class="field"> | <div class="field"> | ||||
| <textarea name="merge_message_field" rows="5" placeholder="{{$.i18n.Tr "repo.editor.commit_message_desc"}}">{{$approvers}}</textarea> | |||||
| <textarea name="merge_message_field" rows="5" placeholder="{{$.i18n.Tr "repo.editor.commit_message_desc"}}">Reviewed-on: {{$.Issue.HTMLURL}} {{$approvers}}</textarea> | |||||
| </div> | </div> | ||||
| <button class="ui green button" type="submit" name="do" value="merge"> | <button class="ui green button" type="submit" name="do" value="merge"> | ||||
| {{$.i18n.Tr "repo.pulls.merge_pull_request"}} | {{$.i18n.Tr "repo.pulls.merge_pull_request"}} | ||||
| @@ -185,7 +185,7 @@ | |||||
| <input type="text" name="merge_title_field" value="{{.Issue.PullRequest.GetDefaultMergeMessage}}"> | <input type="text" name="merge_title_field" value="{{.Issue.PullRequest.GetDefaultMergeMessage}}"> | ||||
| </div> | </div> | ||||
| <div class="field"> | <div class="field"> | ||||
| <textarea name="merge_message_field" rows="5" placeholder="{{$.i18n.Tr "repo.editor.commit_message_desc"}}">{{$approvers}}</textarea> | |||||
| <textarea name="merge_message_field" rows="5" placeholder="{{$.i18n.Tr "repo.editor.commit_message_desc"}}">Reviewed-on: {{$.Issue.HTMLURL}} {{$approvers}}</textarea> | |||||
| </div> | </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"}} | ||||
| @@ -205,7 +205,7 @@ | |||||
| <input type="text" name="merge_title_field" value="{{.Issue.PullRequest.GetDefaultSquashMessage}}"> | <input type="text" name="merge_title_field" value="{{.Issue.PullRequest.GetDefaultSquashMessage}}"> | ||||
| </div> | </div> | ||||
| <div class="field"> | <div class="field"> | ||||
| <textarea name="merge_message_field" rows="5" placeholder="{{$.i18n.Tr "repo.editor.commit_message_desc"}}">{{$commitMessages}}{{$approvers}}</textarea> | |||||
| <textarea name="merge_message_field" rows="5" placeholder="{{$.i18n.Tr "repo.editor.commit_message_desc"}}">{{$commitMessages}}Reviewed-on: {{$.Issue.HTMLURL}} {{$approvers}}</textarea> | |||||
| </div> | </div> | ||||
| <button class="ui green button" type="submit" name="do" value="squash"> | <button class="ui green button" type="submit" name="do" value="squash"> | ||||
| {{$.i18n.Tr "repo.pulls.squash_merge_pull_request"}} | {{$.i18n.Tr "repo.pulls.squash_merge_pull_request"}} | ||||