|
|
|
@ -153,7 +153,7 @@ |
|
|
|
|
<input type="text" name="merge_title_field" value="{{.Issue.PullRequest.GetDefaultMergeMessage}}"> |
|
|
|
|
</div> |
|
|
|
|
<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> |
|
|
|
|
<button class="ui green button" type="submit" name="do" value="merge"> |
|
|
|
|
{{$.i18n.Tr "repo.pulls.merge_pull_request"}} |
|
|
|
@ -185,7 +185,7 @@ |
|
|
|
|
<input type="text" name="merge_title_field" value="{{.Issue.PullRequest.GetDefaultMergeMessage}}"> |
|
|
|
|
</div> |
|
|
|
|
<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> |
|
|
|
|
<button class="ui green button" type="submit" name="do" value="rebase-merge"> |
|
|
|
|
{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}} |
|
|
|
@ -205,7 +205,7 @@ |
|
|
|
|
<input type="text" name="merge_title_field" value="{{.Issue.PullRequest.GetDefaultSquashMessage}}"> |
|
|
|
|
</div> |
|
|
|
|
<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> |
|
|
|
|
<button class="ui green button" type="submit" name="do" value="squash"> |
|
|
|
|
{{$.i18n.Tr "repo.pulls.squash_merge_pull_request"}} |
|
|
|
|