diff options
| author | 6543 <6543@obermui.de> | 2020-04-10 13:26:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-10 14:26:37 +0300 |
| commit | bc362ea3c611a94e7920a3cf4691fd108f874ef0 (patch) | |
| tree | ec573e8194163a023f5480515ddb8f44f5bc4af5 /templates | |
| parent | 0a2cba972a18de5b772f001d570fff96277cd808 (diff) | |
| download | gitea-bc362ea3c611a94e7920a3cf4691fd108f874ef0.tar.gz gitea-bc362ea3c611a94e7920a3cf4691fd108f874ef0.zip | |
remove package code.gitea.io/gitea/modules/git import out of models (#11025)
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/issue/view_content/pull.tmpl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index 09c7cd1d9f..baad7f864d 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -234,7 +234,6 @@ </div> {{end}} {{if $prUnit.PullRequestsConfig.AllowSquash}} - {{$commitMessages := .Issue.PullRequest.GetCommitMessages}} <div class="ui form squash-fields" style="display: none"> <form action="{{.Link}}/merge" method="post"> {{.CsrfTokenHtml}} @@ -242,7 +241,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}}Reviewed-on: {{$.Issue.HTMLURL}} {{$approvers}}</textarea> + <textarea name="merge_message_field" rows="5" placeholder="{{$.i18n.Tr "repo.editor.commit_message_desc"}}">{{.GetCommitMessages}}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"}} |