Fix manual merge form and 404 page templates (#30000)

Partially backport #29985, fix some template errors.

* fix the manual-merge form
* fix the 404 page
This commit is contained in:
wxiaoguang
2024-03-22 19:42:41 +08:00
committed by GitHub
parent e1e88f9ad1
commit 24c66c5096
2 changed files with 3 additions and 7 deletions

View File

@@ -360,7 +360,7 @@
{{if and $.StillCanManualMerge (not $showGeneralMergeForm)}}
<div class="divider"></div>
<div class="ui form">
<form action="{{.Link}}/merge" method="post">
<form class="form-fetch-action" 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"}}">