diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2024-03-22 19:17:30 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-22 19:17:30 +0800 |
| commit | 226231ea27d4f2b0f09fa4efb39501507613b284 (patch) | |
| tree | f7a45b173d4c96ff34c3fe7e7da8c73dce8a4ae3 /templates/repo | |
| parent | 2f060c5834d81f0317c795fc281f9a07e03e5962 (diff) | |
| download | gitea-226231ea27d4f2b0f09fa4efb39501507613b284.tar.gz gitea-226231ea27d4f2b0f09fa4efb39501507613b284.zip | |
Fix some pending problems (#29985)
These changes are quite independent and trivial, so I don't want to open
too many PRs.
* https://github.com/go-gitea/gitea/pull/29882#discussion_r1529607091
* the `f.Close` should be called properly
* the error message could be more meaningful
(https://github.com/go-gitea/gitea/pull/29882#pullrequestreview-1942557935)
*
https://github.com/go-gitea/gitea/pull/29859#pullrequestreview-1942324716
* the new translation strings don't take arguments
* https://github.com/go-gitea/gitea/pull/28710#discussion_r1443778807
* stale for long time
* #28140
* a form was forgotten to be changed to work with backend code
Diffstat (limited to 'templates/repo')
| -rw-r--r-- | templates/repo/issue/view_content/pull.tmpl | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index c8e8038438..aac30180df 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -374,17 +374,15 @@ */}} {{if and $.StillCanManualMerge (not $showGeneralMergeForm)}} <div class="divider"></div> - <div class="ui form"> - <form action="{{.Link}}/merge" method="post"> - {{.CsrfTokenHtml}} - <div class="field"> - <input type="text" name="merge_commit_id" placeholder="{{ctx.Locale.Tr "repo.pulls.merge_commit_id"}}"> - </div> - <button class="ui red button" type="submit" name="do" value="manually-merged"> - {{ctx.Locale.Tr "repo.pulls.merge_manually"}} - </button> - </form> - </div> + <form class="ui form form-fetch-action" action="{{.Link}}/merge" method="post">{{/* another similar form is in PullRequestMergeForm.vue*/}} + {{.CsrfTokenHtml}} + <div class="field"> + <input type="text" name="merge_commit_id" placeholder="{{ctx.Locale.Tr "repo.pulls.merge_commit_id"}}"> + </div> + <button class="ui red button" type="submit" name="do" value="manually-merged"> + {{ctx.Locale.Tr "repo.pulls.merge_manually"}} + </button> + </form> {{end}} {{if and .Issue.PullRequest.HeadRepo (not .Issue.PullRequest.HasMerged) (not .Issue.IsClosed)}} |