feat: update gitea vendor

package/gitea/source/templates/repo/issue/view_content/comments.tmpl

@@ -86,7 +86,7 @@
 					{{template "shared/user/avatarlink" dict "user" .Poster}}
 				{{end}}
 				<span class="comment-text-line">
-					{{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}}
+					{{template "repo/issue/view_content/comments_authorlink" dict "comment" .}}
 					{{if .Issue.IsPull}}
 						{{ctx.Locale.Tr "repo.pulls.reopened_at" .EventTag $createdStr}}
 					{{else}}
@@ -101,7 +101,7 @@
 					{{template "shared/user/avatarlink" dict "user" .Poster}}
 				{{end}}
 				<span class="comment-text-line">
-					{{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}}
+					{{template "repo/issue/view_content/comments_authorlink" dict "comment" .}}
 					{{if .Issue.IsPull}}
 						{{ctx.Locale.Tr "repo.pulls.closed_at" .EventTag $createdStr}}
 					{{else}}
@@ -116,7 +116,7 @@
 					{{template "shared/user/avatarlink" dict "user" .Poster}}
 				{{end}}
 				<span class="comment-text-line">
-					{{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}}
+					{{template "repo/issue/view_content/comments_authorlink" dict "comment" .}}
 					{{$link := printf "%s/commit/%s" $.Repository.Link ($.Issue.PullRequest.MergedCommitID|PathEscape)}}
 					{{if eq $.Issue.PullRequest.Status 3}}
 						{{ctx.Locale.Tr "repo.issues.comment_manually_pull_merged_at" (HTMLFormat `<a class="ui sha" href="%[1]s"><b>%[2]s</b></a>` $link (ShortSha $.Issue.PullRequest.MergedCommitID)) (HTMLFormat "<b>%[1]s</b>" $.BaseTarget) $createdStr}}
@@ -164,12 +164,12 @@
 				<div class="detail flex-text-block">
 					{{svg "octicon-git-commit"}}
 					{{/* the content is a link like <a href="{RepoLink}/commit/{CommitID}">message title</a> (from CreateRefComment) */}}
-					<span class="comment-text-line">{{.Content | SanitizeHTML}}</span>
+					<span class="comment-text-line">{{.GetSanitizedContentHTML}}</span>
 				</div>
 			</div>
 		{{else if eq .Type 7}}
 			{{if or .AddedLabels .RemovedLabels}}
-				<div class="timeline-item event with-labels-list-inline" id="{{.HashTag}}">
+				<div class="timeline-item event" id="{{.HashTag}}">
 					<span class="badge">{{svg "octicon-tag"}}</span>
 					{{template "shared/user/avatarlink" dict "user" .Poster}}
 					<span class="comment-text-line">
@@ -256,7 +256,7 @@
 					{{if not $timeStr}}{{$timeStr = .Content|Sec2Hour}}{{end}}
 					{{ctx.Locale.Tr "repo.issues.stop_tracking_history" $timeStr $createdStr}}
 				</span>
-				{{template "repo/issue/view_content/comments_delete_time" dict "ctxData" $ "comment" .}}
+				{{template "repo/issue/view_content/comments_delete_time" dict "comment" .}}
 			</div>
 		{{else if eq .Type 14}}
 			<div class="timeline-item event" id="{{.HashTag}}">
@@ -268,7 +268,7 @@
 					{{if not $timeStr}}{{$timeStr = .Content|Sec2Hour}}{{end}}
 					{{ctx.Locale.Tr "repo.issues.add_time_history" $timeStr $createdStr}}
 				</span>
-				{{template "repo/issue/view_content/comments_delete_time" dict "ctxData" $ "comment" .}}
+				{{template "repo/issue/view_content/comments_delete_time" dict "comment" .}}
 			</div>
 		{{else if eq .Type 15}}
 			<div class="timeline-item event" id="{{.HashTag}}">
@@ -361,9 +361,10 @@
 			</div>
 		{{else if eq .Type 22}}
 			<div class="timeline-item-group" id="{{.HashTag}}">
-				<div class="timeline-item event">
-					{{$reviewType := -1}}
-					{{if .Review}}{{$reviewType = .Review.Type}}{{end}}
+				{{/* default to the "comment" type and the comment anchor if the review record is missing */}}
+				{{$reviewType := 2}}{{$reviewHashTag := .HashTag}}
+				{{if .Review}}{{$reviewType = .Review.Type}}{{$reviewHashTag = .Review.HashTag}}{{end}}
+				<div class="timeline-item event"{{if .Review}} id="{{$reviewHashTag}}"{{end}}>
 					{{if not .OriginalAuthor}}
 					{{/* Some timeline avatars need a offset to correctly align with their speech bubble.
 						The condition depends on whether the comment has contents/attachments,
@@ -372,19 +373,22 @@
 						{{ctx.AvatarUtils.Avatar .Poster 40}}
 					</a>
 					{{end}}
-					<span class="badge tw-text-white{{if eq $reviewType 1}}{{if .Review.Official}} tw-bg-green {{else}} tw-bg-grey{{end}}{{else if eq $reviewType 3}} tw-bg-red{{end}}">
-						{{if .Review}}{{svg (printf "octicon-%s" .Review.Type.Icon)}}{{end}}
+					<span class="badge tw-text-white {{if eq $reviewType 1}}{{Iif .Review.Official "tw-bg-green" "tw-bg-grey"}}{{else if eq $reviewType 3}}tw-bg-red{{end}}">
+						{{- if .Review -}}
+							{{- svg (printf "octicon-%s" .Review.Type.Icon) -}}
+						{{- else -}}
+							{{- svg "octicon-comment" -}}
+						{{- end -}}
 					</span>
 					<span class="comment-text-line">
-						{{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}}
+						{{template "repo/issue/view_content/comments_authorlink" dict "comment" .}}
+						{{$createdLink := HTMLFormat `<a href="#%s">%s</a>` $reviewHashTag $createdStr}}
 						{{if eq $reviewType 1}}
-							{{ctx.Locale.Tr "repo.issues.review.approve" $createdStr}}
-						{{else if eq $reviewType 2}}
-							{{ctx.Locale.Tr "repo.issues.review.comment" $createdStr}}
+							{{ctx.Locale.Tr "repo.issues.review.approve" $createdLink}}
 						{{else if eq $reviewType 3}}
-							{{ctx.Locale.Tr "repo.issues.review.reject" $createdStr}}
+							{{ctx.Locale.Tr "repo.issues.review.reject" $createdLink}}
 						{{else}}
-							{{ctx.Locale.Tr "repo.issues.review.comment" $createdStr}}
+							{{ctx.Locale.Tr "repo.issues.review.comment" $createdLink}}
 						{{end}}
 						{{if and .Review .Review.Dismissed}}
 							<div class="ui small label">{{ctx.Locale.Tr "repo.issues.review.dismissed_label"}}</div>
@@ -488,7 +492,7 @@
 					{{template "shared/user/avatarlink" dict "user" .Poster}}
 				{{end}}
 				<span class="comment-text-line">
-					{{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}}
+					{{template "repo/issue/view_content/comments_authorlink" dict "comment" .}}
 					{{ctx.Locale.Tr "repo.pulls.change_target_branch_at" .OldRef .NewRef $createdStr}}
 				</span>
 			</div>
@@ -663,7 +667,7 @@
 			<div class="timeline-item event" id="{{.HashTag}}">
 				<span class="badge">{{svg "octicon-git-merge" 16}}</span>
 				<span class="comment-text-line">
-					{{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}}
+					{{template "repo/issue/view_content/comments_authorlink" dict "comment" .}}
 					{{if eq .Type 34}}{{ctx.Locale.Tr "repo.pulls.auto_merge_newly_scheduled_comment" $createdStr}}
 					{{else}}{{ctx.Locale.Tr "repo.pulls.auto_merge_canceled_schedule_comment" $createdStr}}{{end}}
 				</span>

package/gitea/source/templates/repo/issue/view_content/comments_authorlink.tmpl

@@ -1,10 +1,10 @@
 {{if .comment.OriginalAuthor}}
 	<span class="tw-text-text">
-		{{svg (MigrationIcon .ctxData.Repository.GetOriginalURLHostname)}}
+		{{svg (MigrationIcon ctx.RootData.Repository.GetOriginalURLHostname)}}
 		{{.comment.OriginalAuthor}}
 	</span>
-	{{if .ctxData.Repository.OriginalURL}}
-		<span class="migrate">({{ctx.Locale.Tr "repo.migrated_from" .ctxData.Repository.OriginalURL .ctxData.Repository.GetOriginalURLHostname}})</span>
+	{{if ctx.RootData.Repository.OriginalURL}}
+		<span class="migrate">({{ctx.Locale.Tr "repo.migrated_from" ctx.RootData.Repository.OriginalURL ctx.RootData.Repository.GetOriginalURLHostname}})</span>
 	{{end}}
 {{else}}
 	{{template "shared/user/authorlink" .comment.Poster}}

package/gitea/source/templates/repo/issue/view_content/comments_delete_time.tmpl

@@ -1,9 +1,9 @@
-{{if and .comment.Time (.ctxData.Repository.IsTimetrackerEnabled ctx)}} {{/* compatibility with time comments made before v1.14 */}}
+{{if and .comment.Time (ctx.RootData.Repository.IsTimetrackerEnabled ctx)}} {{/* compatibility with time comments made before v1.14 */}}
 	{{if (not .comment.Time.Deleted)}}
-		{{if (or .ctxData.IsAdmin (and .ctxData.IsSigned (eq .ctxData.SignedUserID .comment.PosterID)))}}
+		{{if (or ctx.RootData.IsAdmin (and ctx.RootData.IsSigned (eq ctx.RootData.SignedUserID .comment.PosterID)))}}
 			<span class="tw-ml-auto">
 				<button class="ui icon button compact mini link-action" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.del_time"}}"
-								data-url="{{.ctxData.RepoLink}}/issues/{{.ctxData.Issue.Index}}/times/{{.comment.TimeID}}/delete?id={{.comment.Time.ID}}"
+								data-url="{{ctx.RootData.RepoLink}}/issues/{{ctx.RootData.Issue.Index}}/times/{{.comment.TimeID}}/delete?id={{.comment.Time.ID}}"
 								data-modal-confirm="{{ctx.Locale.Tr "repo.issues.del_time"}}"
 				>
 					{{svg "octicon-trash"}}

package/gitea/source/templates/repo/issue/view_content/context_menu.tmpl

@@ -3,13 +3,14 @@
 		{{svg "octicon-kebab-horizontal"}}
 	</a>
 	<div class="menu">
-		{{$referenceUrl := ""}}
-		{{if .issue}}
-			{{$referenceUrl = printf "%s#%s" ctx.RootData.Issue.Link .item.HashTag}}
+		{{$issueHTMLURL := ctx.RootData.Issue.HTMLURL ctx}}
+		{{$referenceHTMLURL := ""}}
+		{{if .issue}}{{/* boolean value: is issue */}}
+			{{$referenceHTMLURL = printf "%s#%s" $issueHTMLURL .item.HashTag}}
 		{{else}}
-			{{$referenceUrl = printf "%s/files#%s" ctx.RootData.Issue.Link .item.HashTag}}
+			{{$referenceHTMLURL = printf "%s/files#%s" $issueHTMLURL .item.HashTag}}
 		{{end}}
-		<div class="item context js-aria-clickable" data-clipboard-text-type="url" data-clipboard-text="{{$referenceUrl}}">{{ctx.Locale.Tr "repo.issues.context.copy_link"}}</div>
+		<div class="item context js-aria-clickable" data-clipboard-text="{{$referenceHTMLURL}}">{{ctx.Locale.Tr "repo.issues.context.copy_link"}}</div>
 		<div class="item context js-aria-clickable" data-clipboard-target="#{{.item.HashTag}}-raw">{{ctx.Locale.Tr "repo.issues.context.copy_source"}}</div>
 		{{if ctx.RootData.IsSigned}}
 			{{$needDivider := false}}
@@ -17,7 +18,7 @@
 				{{$needDivider = true}}
 				<div class="item context js-aria-clickable quote-reply {{if .diff}}quote-reply-diff{{end}}" data-target="{{.item.HashTag}}-raw">{{ctx.Locale.Tr "repo.issues.context.quote_reply"}}</div>
 				{{if not ctx.Consts.RepoUnitTypeIssues.UnitGlobalDisabled}}
-					<div class="item context js-aria-clickable reference-issue" data-target="{{.item.HashTag}}-raw" data-modal="#reference-issue-modal" data-poster="{{.item.Poster.GetDisplayName}}" data-poster-username="{{.item.Poster.Name}}" data-reference="{{$referenceUrl}}">{{ctx.Locale.Tr "repo.issues.context.reference_issue"}}</div>
+					<div class="item context js-aria-clickable reference-issue" data-target="{{.item.HashTag}}-raw" data-modal="#reference-issue-modal" data-poster="{{.item.Poster.GetDisplayName}}" data-poster-username="{{.item.Poster.Name}}" data-reference="{{$referenceHTMLURL}}">{{ctx.Locale.Tr "repo.issues.context.reference_issue"}}</div>
 				{{end}}
 				{{if or ctx.RootData.Permission.IsAdmin .IsCommentPoster ctx.RootData.HasIssuesOrPullsWritePermission}}
 					<div class="divider"></div>
@@ -34,10 +35,10 @@
 					<div class="divider"></div>
 				{{end}}
 				{{if $canUserBlock}}
-				<div class="item context js-aria-clickable show-modal" data-modal="#block-user-modal" data-modal-modal-blockee="{{.item.Poster.Name}}" data-modal-modal-blockee-name="{{.item.Poster.GetDisplayName}}" data-modal-modal-form.action="{{AppSubUrl}}/user/settings/blocked_users">{{ctx.Locale.Tr "user.block.block.user"}}</div>
+				<div class="item context js-aria-clickable show-modal" data-modal="#block-user-modal" data-modal-modal-blockee="{{.item.Poster.Name}}" data-modal-modal-blockee-name="{{.item.Poster.GetDisplayName}}" data-modal-modal-form.url="{{AppSubUrl}}/user/settings/blocked_users">{{ctx.Locale.Tr "user.block.block.user"}}</div>
 				{{end}}
 				{{if $canOrgBlock}}
-				<div class="item context js-aria-clickable show-modal" data-modal="#block-user-modal" data-modal-modal-blockee="{{.item.Poster.Name}}" data-modal-modal-blockee-name="{{.item.Poster.GetDisplayName}}" data-modal-modal-form.action="{{ctx.RootData.Repository.Owner.OrganisationLink}}/settings/blocked_users">{{ctx.Locale.Tr "user.block.block.org"}}</div>
+				<div class="item context js-aria-clickable show-modal" data-modal="#block-user-modal" data-modal-modal-blockee="{{.item.Poster.Name}}" data-modal-modal-blockee-name="{{.item.Poster.GetDisplayName}}" data-modal-modal-form.url="{{ctx.RootData.Repository.Owner.OrganisationLink}}/settings/blocked_users">{{ctx.Locale.Tr "user.block.block.org"}}</div>
 				{{end}}
 			{{end}}
 		{{end}}

package/gitea/source/templates/repo/issue/view_content/conversation.tmpl

@@ -11,7 +11,7 @@ The variables in "ctx.Data" are different in each case, making this template fra
 	{{$hasReview := and $comment.Review}}
 	{{$isReviewPending := and $hasReview (eq $comment.Review.Type 0)}}
 	<div class="ui segments conversation-holder">
-		<div class="ui segment collapsible-comment-box tw-py-2 tw-flex tw-items-center tw-justify-between">
+		<div class="ui segment collapsible-comment-box tw-py-2 flex-left-right">
 			<div class="tw-flex tw-items-center">
 				<a href="{{$comment.CodeCommentLink ctx}}" class="file-comment tw-ml-2 tw-break-anywhere">{{$comment.TreePath}}</a>
 				{{if $invalid}}

package/gitea/source/templates/repo/issue/view_content/pull_merge_box.tmpl

@@ -1,408 +1,81 @@
-{{if and .Issue.PullRequest.HasMerged (not .IsPullBranchDeletable)}}
-{{/* Then the merge box will not be displayed because this page already contains enough information */}}
-{{else}}
+{{$data := $.PullMergeBoxData}}
+{{if $data.ShowMergeBox}}
 <div class="timeline-item comment pull-merge-box"
 	data-global-init="initRepoPullMergeBox"
-	{{if .PullMergeBoxReloadingInterval}}
-		data-pull-merge-box-reloading-interval="{{.PullMergeBoxReloadingInterval}}"
-		data-pull-link="{{.Issue.Link}}"
+	{{if $data.ReloadingInterval}}
+		data-pull-merge-box-reloading-interval="{{$data.ReloadingInterval}}"
+		data-pull-link="{{$.Issue.Link}}"
 	{{end}}
 >
-	{{$statusCheckData := .StatusCheckData}}
-	{{$requiredStatusCheckState := $statusCheckData.RequiredChecksState}}
-	<div class="timeline-avatar {{if .Issue.PullRequest.HasMerged}}tw-text-purple
-	{{- else if .Issue.IsClosed}}tw-text-text-light
-	{{- else if .IsPullWorkInProgress}}tw-text-text-light
-	{{- else if .IsFilesConflicted}}tw-text-text-light
-	{{- else if .IsPullRequestBroken}}tw-text-red
-	{{- else if .IsBlockedByApprovals}}tw-text-red
-	{{- else if .IsBlockedByRejection}}tw-text-red
-	{{- else if .IsBlockedByOfficialReviewRequests}}tw-text-red
-	{{- else if .IsBlockedByOutdatedBranch}}tw-text-red
-	{{- else if .IsBlockedByChangedProtectedFiles}}tw-text-red
-	{{- else if and .EnableStatusCheck (or $requiredStatusCheckState.IsFailure $requiredStatusCheckState.IsError)}}tw-text-red
-	{{- else if and .EnableStatusCheck (or (not $.LatestCommitStatus) $requiredStatusCheckState.IsPending $requiredStatusCheckState.IsWarning)}}tw-text-yellow
-	{{- else if and .AllowMerge .RequireSigned (not .WillSign)}}tw-text-red
-	{{- else if .Issue.PullRequest.IsChecking}}tw-text-yellow
-	{{- else if .Issue.PullRequest.IsEmpty}}tw-text-text-light
-	{{- else if .Issue.PullRequest.CanAutoMerge}}tw-text-green
-	{{- else}}tw-text-red{{end}}">{{svg "octicon-git-merge" 40}}</div>
+	<div class="timeline-avatar {{$data.TimelineIconClass}}">{{svg "octicon-git-merge" 40}}</div>
 	<div class="content">
-		{{if .LatestCommitStatus}}
-		<div class="ui attached segment fitted">
-		{{template "repo/pulls/status" (dict
-			"CommitStatus" .LatestCommitStatus
-			"CommitStatuses" .LatestCommitStatuses
-			"ShowHideChecks" true
-			"StatusCheckData" $statusCheckData
-		)}}
-		</div>
-		{{end}}
-		{{$showGeneralMergeForm := false}}
-		<div class="ui attached segment merge-section {{if not $.LatestCommitStatus}}avatar-content-left-arrow{{end}} flex-items-block">
-			{{if .Issue.PullRequest.HasMerged}}
-				{{if .IsPullBranchDeletable}}
-					<div class="item item-section text tw-flex-1">
-						<div class="item-section-left">
-							<h3 class="tw-mb-2">
-								{{ctx.Locale.Tr "repo.pulls.merged_success"}}
-							</h3>
-							<div class="merge-section-info">
-								{{ctx.Locale.Tr "repo.pulls.merged_info_text" (HTMLFormat "<code>%s</code>" .HeadTarget)}}
-							</div>
-						</div>
-						<div class="item-section-right">
+		<div class="ui segment fitted avatar-content-left-arrow">
+			<div class="merge-section flex-divided-list items-px-default">
+			{{if $data.ShowStatusCheck}}
+				{{template "repo/issue/view_content/pull_merge_status_checks" (dict "StatusCheckData" $data.StatusCheckData)}}
+			{{end}}
+
+			{{if $data.ClosedInfoTitle}}
+				<div class="item flex-left-right">
+					<div>
+						<h3 class="tw-mb-2">{{$data.ClosedInfoTitle}}</h3>
+						<div>{{$data.ClosedInfoBody}}</div>
+					</div>
+					{{if $data.IsPullBranchDeletable}}
+						<div>
 							<button class="ui button link-action delete-branch-after-merge" data-url="{{.DeleteBranchLink}}">{{ctx.Locale.Tr "repo.branch.delete_html"}}</button>
 						</div>
-					</div>
+					{{end}}
+				</div>
+			{{end}}
+			{{range $infoSection := $data.InfoSections}}
+				{{if $infoSection.InfoItems}}
+				<div class="item">
+					{{range $infoItem := $infoSection.InfoItems}}
+						<div class="flex-text-block">{{$infoItem.SvgIconHTML}} {{$infoItem.InfoHTML}}</div>
+						{{if $infoItem.ListItems}}
+							<ul class="tw-pl-[36px]">{{/* align with the info icon and text */}}
+								{{range $listItem := $infoItem.ListItems}}
+									<li>{{$listItem}}</li>
+								{{end}}
+							</ul>
+						{{end}}
+					{{end}}
+				</div>
 				{{end}}
-			{{else if .Issue.IsClosed}}
-				<div class="item item-section text tw-flex-1">
-					<div class="item-section-left">
-						<h3 class="tw-mb-2">{{ctx.Locale.Tr "repo.pulls.closed"}}</h3>
-						<div class="merge-section-info">
-							{{if .IsPullRequestBroken}}
-								{{ctx.Locale.Tr "repo.pulls.cant_reopen_deleted_branch"}}
-							{{else}}
-								{{ctx.Locale.Tr "repo.pulls.reopen_to_merge"}}
-							{{end}}
-						</div>
-					</div>
-					{{if and .IsPullBranchDeletable (not .IsPullRequestBroken)}}
-						<div class="item-section-right">
-							<button class="ui button link-action delete-branch-after-merge" data-url="{{.DeleteBranchLink}}">{{ctx.Locale.Tr "repo.branch.delete_html"}}</button>
-						</div>
-					{{end}}
-				</div>
-			{{else if .IsPullFilesConflicted}}
+			{{end}}
+			{{if $data.ShowUpdatePullInfo}}
 				<div class="item">
-					{{svg "octicon-x"}}
-					{{ctx.Locale.Tr "repo.pulls.files_conflicted"}}
+					{{template "repo/issue/view_content/update_branch_by_merge" (dict "MergeBoxData" $data "IssueLink" $.Issue.Link)}}
 				</div>
-				<ul>
-					{{range .ConflictedFiles}}
-					<li>{{.}}</li>
-					{{else}}
-					<li>{{ctx.Locale.Tr "repo.pulls.files_conflicted_no_listed_files"}}</li>
-					{{end}}
-				</ul>
-			{{else if .IsPullRequestBroken}}
-				<div class="item">
-					{{svg "octicon-x"}}
-					{{ctx.Locale.Tr "repo.pulls.data_broken"}}
-				</div>
-			{{else if .IsPullWorkInProgress}}
-				<div class="item">
-					<div class="item-section-left flex-text-inline tw-flex-1">
-						{{svg "octicon-x"}}
-						{{ctx.Locale.Tr "repo.pulls.cannot_merge_work_in_progress"}}
+			{{end}}
+
+			{{if $.IsPullWorkInProgress}}
+				<div class="item flex-left-right">
+					<div class="flex-text-block">
+						{{svg "octicon-x"}} {{ctx.Locale.Tr "repo.pulls.cannot_merge_work_in_progress"}}
 					</div>
 					{{if or .HasIssuesOrPullsWritePermission .IsIssuePoster}}
-						<button class="ui compact button" data-global-init="initPullRequestWipToggle" data-title="{{.Issue.Title}}" data-wip-prefix="{{.WorkInProgressPrefix}}" data-update-url="{{.Issue.Link}}/title">
-							{{ctx.Locale.Tr "repo.pulls.remove_prefix" .WorkInProgressPrefix}}
-						</button>
-					{{end}}
-				</div>
-				{{template "repo/issue/view_content/update_branch_by_merge" $}}
-			{{else if .Issue.PullRequest.IsChecking}}
-				<div class="item">
-					{{svg "gitea-running" 16 "rotate-clockwise"}}
-					{{ctx.Locale.Tr "repo.pulls.is_checking"}}
-				</div>
-			{{else if .Issue.PullRequest.IsAncestor}}
-				<div class="item">
-					{{svg "octicon-alert"}}
-					{{ctx.Locale.Tr "repo.pulls.is_ancestor"}}
-				</div>
-			{{else if or .Issue.PullRequest.CanAutoMerge .Issue.PullRequest.IsEmpty}}
-				{{if .IsBlockedByApprovals}}
-					<div class="item">
-						{{svg "octicon-x"}}
-						{{if .RequireApprovalsWhitelist}}
-							{{ctx.Locale.Tr "repo.pulls.blocked_by_approvals_whitelisted" .GrantedApprovals .ProtectedBranch.RequiredApprovals}}
-						{{else}}
-							{{ctx.Locale.Tr "repo.pulls.blocked_by_approvals" .GrantedApprovals .ProtectedBranch.RequiredApprovals}}
-						{{end}}
-					</div>
-				{{else if .IsBlockedByRejection}}
-					<div class="item">
-						{{svg "octicon-x"}}
-					{{ctx.Locale.Tr "repo.pulls.blocked_by_rejection"}}
-					</div>
-				{{else if .IsBlockedByOfficialReviewRequests}}
-					<div class="item">
-						{{svg "octicon-x"}}
-					{{ctx.Locale.Tr "repo.pulls.blocked_by_official_review_requests"}}
-					</div>
-				{{else if .IsBlockedByOutdatedBranch}}
-					<div class="item">
-						{{svg "octicon-x"}}
-						{{ctx.Locale.Tr "repo.pulls.blocked_by_outdated_branch"}}
-					</div>
-				{{else if .IsBlockedByChangedProtectedFiles}}
-					<div class="item">
-						{{svg "octicon-x"}}
-						{{ctx.Locale.TrN $.ChangedProtectedFilesNum "repo.pulls.blocked_by_changed_protected_files_1" "repo.pulls.blocked_by_changed_protected_files_n"}}
-					</div>
-					<ul>
-						{{range .ChangedProtectedFiles}}
-						<li>{{.}}</li>
-						{{end}}
-					</ul>
-				{{else if and .EnableStatusCheck (or $requiredStatusCheckState.IsError $requiredStatusCheckState.IsFailure)}}
-					<div class="item">
-						{{svg "octicon-x"}}
-						{{ctx.Locale.Tr "repo.pulls.required_status_check_failed"}}
-					</div>
-				{{else if and .EnableStatusCheck (not $requiredStatusCheckState.IsSuccess)}}
-					<div class="item">
-						{{svg "octicon-x"}}
-						{{ctx.Locale.Tr "repo.pulls.required_status_check_missing"}}
-					</div>
-				{{else if and .AllowMerge .RequireSigned (not .WillSign)}}
-					<div class="item">
-						{{svg "octicon-x"}}
-						{{ctx.Locale.Tr "repo.pulls.require_signed_wont_sign"}}
-					</div>
-					<div class="item">
-						{{svg "octicon-unlock"}}
-						{{ctx.Locale.Tr (printf "repo.signing.wont_sign.%s" .WontSignReason)}}
-					</div>
-				{{end}}
-
-				{{$notAllOverridableChecksOk := or .IsBlockedByApprovals .IsBlockedByRejection .IsBlockedByOfficialReviewRequests .IsBlockedByOutdatedBranch .IsBlockedByChangedProtectedFiles (and .EnableStatusCheck (not $requiredStatusCheckState.IsSuccess))}}
-
-				{{/* admin can merge without checks, writer can merge when checks succeed */}}
-				{{$canMergeNow := and (or (and (not $.ProtectedBranch.BlockAdminMergeOverride) $.IsRepoAdmin) (not $notAllOverridableChecksOk)) (or (not .AllowMerge) (not .RequireSigned) .WillSign)}}
-				{{/* admin and writer both can make an auto merge schedule */}}
-
-				{{if $canMergeNow}}
-					{{if $notAllOverridableChecksOk}}
-						<div class="item">
-							{{svg "octicon-dot-fill"}}
-							{{ctx.Locale.Tr "repo.pulls.required_status_check_administrator"}}
-						</div>
-					{{else}}
-						<div class="item">
-							{{svg "octicon-check"}}
-							{{ctx.Locale.Tr "repo.pulls.can_auto_merge_desc"}}
-						</div>
-					{{end}}
-					{{if .WillSign}}
-						<div class="item">
-							{{svg "octicon-lock" 16 "tw-text-green"}}
-							{{ctx.Locale.Tr "repo.signing.will_sign" .SigningKeyMergeDisplay}}
-						</div>
-					{{else if .IsSigned}}
-						<div class="item">
-							{{svg "octicon-unlock"}}
-							{{ctx.Locale.Tr (printf "repo.signing.wont_sign.%s" .WontSignReason)}}
-						</div>
-					{{end}}
-				{{end}}
-
-				{{template "repo/issue/view_content/update_branch_by_merge" $}}
-
-				{{if .Issue.PullRequest.IsEmpty}}
-					<div class="divider"></div>
-					<div class="item">
-						{{svg "octicon-alert"}}
-						{{ctx.Locale.Tr "repo.pulls.is_empty"}}
-					</div>
-				{{end}}
-
-				{{if .AllowMerge}} {{/* user is allowed to merge */}}
-					{{$prUnit := .Repository.MustGetUnit ctx ctx.Consts.RepoUnitTypePullRequests}}
-					{{if or $prUnit.PullRequestsConfig.AllowMerge $prUnit.PullRequestsConfig.AllowRebase $prUnit.PullRequestsConfig.AllowRebaseMerge $prUnit.PullRequestsConfig.AllowSquash $prUnit.PullRequestsConfig.AllowFastForwardOnly}}
-						{{$hasPendingPullRequestMergeTip := ""}}
-						{{if .HasPendingPullRequestMerge}}
-							{{$createdPRMergeStr := DateUtils.TimeSince .PendingPullRequestMerge.CreatedUnix}}
-							{{$hasPendingPullRequestMergeTip = ctx.Locale.Tr "repo.pulls.auto_merge_has_pending_schedule" .PendingPullRequestMerge.Doer.Name $createdPRMergeStr}}
-						{{end}}
-						<div class="divider"></div>
-						<script type="module">
-						(() => {
-							const defaultMergeTitle = {{.DefaultMergeMessage}};
-							const defaultSquashMergeTitle = {{.DefaultSquashMergeMessage}};
-							const defaultMergeMessage = {{.DefaultMergeBody}};
-							const defaultSquashMergeMessage = {{.DefaultSquashMergeBody}};
-							const mergeForm = {
-								'baseLink': {{.Issue.Link}},
-								'textCancel': {{ctx.Locale.Tr "cancel"}},
-								'textDeleteBranch': {{ctx.Locale.Tr "repo.branch.delete" .HeadTarget}},
-								'textAutoMergeButtonWhenSucceed': {{ctx.Locale.Tr "repo.pulls.auto_merge_button_when_succeed"}},
-								'textAutoMergeWhenSucceed': {{ctx.Locale.Tr "repo.pulls.auto_merge_when_succeed"}},
-								'textAutoMergeCancelSchedule': {{ctx.Locale.Tr "repo.pulls.auto_merge_cancel_schedule"}},
-								'textClearMergeMessage': {{ctx.Locale.Tr "repo.pulls.clear_merge_message"}},
-								'textClearMergeMessageHint': {{ctx.Locale.Tr "repo.pulls.clear_merge_message_hint"}},
-								'textMergeCommitId': {{ctx.Locale.Tr "repo.pulls.merge_commit_id"}},
-
-								'canMergeNow': {{$canMergeNow}},
-								'allOverridableChecksOk': {{not $notAllOverridableChecksOk}},
-								'emptyCommit': {{.Issue.PullRequest.IsEmpty}},
-								'pullHeadCommitID': {{.PullHeadCommitID}},
-								'isPullBranchDeletable': {{.IsPullBranchDeletable}},
-								'defaultMergeStyle': {{.MergeStyle}},
-								'defaultDeleteBranchAfterMerge': {{$prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge}},
-								'mergeMessageFieldPlaceHolder': {{ctx.Locale.Tr "repo.editor.commit_message_desc"}},
-								'defaultMergeMessage': defaultMergeMessage,
-
-								'hasPendingPullRequestMerge': {{.HasPendingPullRequestMerge}},
-								'hasPendingPullRequestMergeTip': {{$hasPendingPullRequestMergeTip}},
-							};
-
-							const generalHideAutoMerge = mergeForm.canMergeNow && mergeForm.allOverridableChecksOk; // if this pr can be merged now, then hide the auto merge
-							mergeForm['mergeStyles'] = [
-								{
-									'name': 'merge',
-									'allowed': {{$prUnit.PullRequestsConfig.AllowMerge}},
-									'textDoMerge': {{ctx.Locale.Tr "repo.pulls.merge_pull_request"}},
-									'mergeTitleFieldText': defaultMergeTitle,
-									'mergeMessageFieldText': defaultMergeMessage,
-									'hideAutoMerge': generalHideAutoMerge,
-								},
-								{
-									'name': 'rebase',
-									'allowed': {{$prUnit.PullRequestsConfig.AllowRebase}},
-									'textDoMerge': {{ctx.Locale.Tr "repo.pulls.rebase_merge_pull_request"}},
-									'hideMergeMessageTexts': true,
-									'hideAutoMerge': generalHideAutoMerge,
-								},
-								{
-									'name': 'rebase-merge',
-									'allowed': {{$prUnit.PullRequestsConfig.AllowRebaseMerge}},
-									'textDoMerge': {{ctx.Locale.Tr "repo.pulls.rebase_merge_commit_pull_request"}},
-									'mergeTitleFieldText': defaultMergeTitle,
-									'mergeMessageFieldText': defaultMergeMessage,
-									'hideAutoMerge': generalHideAutoMerge,
-								},
-								{
-									'name': 'squash',
-									'allowed': {{$prUnit.PullRequestsConfig.AllowSquash}},
-									'textDoMerge': {{ctx.Locale.Tr "repo.pulls.squash_merge_pull_request"}},
-									'mergeTitleFieldText': defaultSquashMergeTitle,
-									'mergeMessageFieldText': {{.GetCommitMessages}} + defaultSquashMergeMessage,
-									'hideAutoMerge': generalHideAutoMerge,
-								},
-								{
-									'name': 'fast-forward-only',
-									'allowed': {{and $prUnit.PullRequestsConfig.AllowFastForwardOnly (eq .Issue.PullRequest.CommitsBehind 0)}},
-									'textDoMerge': {{ctx.Locale.Tr "repo.pulls.fast_forward_only_merge_pull_request"}},
-									'hideMergeMessageTexts': true,
-									'hideAutoMerge': generalHideAutoMerge,
-								},
-								{
-									'name': 'manually-merged',
-									'allowed': {{$prUnit.PullRequestsConfig.AllowManualMerge}},
-									'textDoMerge': {{ctx.Locale.Tr "repo.pulls.merge_manually"}},
-									'hideMergeMessageTexts': true,
-									'hideAutoMerge': true,
-								}
-							];
-							window.config.pageData.pullRequestMergeForm = mergeForm;
-						})();
-						</script>
-
-						{{$showGeneralMergeForm = true}}
-						{{/* The merge form is a Vue component. After mounted, it has a button for choosing merge style, so make it have min-height to avoid layout shifting */}}
-						<div id="pull-request-merge-form" class="tw-min-h-[40px]"></div>
-					{{else}}
-						{{/* no merge style was set in repo setting: not or ($prUnit.PullRequestsConfig.AllowMerge ...) */}}
-						<div class="divider"></div>
-						<div class="item tw-text-red">
-							{{svg "octicon-x"}}
-							{{ctx.Locale.Tr "repo.pulls.no_merge_desc"}}
-						</div>
-						<div class="item">
-							{{svg "octicon-info"}}
-							{{ctx.Locale.Tr "repo.pulls.no_merge_helper"}}
-						</div>
-					{{end}} {{/* end if the repo was set to use any merge style */}}
-				{{else}}
-					{{/* user is not allowed to merge */}}
-					<div class="divider"></div>
-					<div class="item">
-						{{svg "octicon-info"}}
-						{{ctx.Locale.Tr "repo.pulls.no_merge_access"}}
-					</div>
-				{{end}} {{/* end if user is allowed to merge or not */}}
-			{{else}}
-				{{/* Merge conflict without specific file. Suggest manual merge, only if all reviews and status checks OK. */}}
-				{{if .IsBlockedByApprovals}}
-					<div class="item tw-text-red">
-						{{svg "octicon-x"}}
-						{{ctx.Locale.Tr "repo.pulls.blocked_by_approvals" .GrantedApprovals .ProtectedBranch.RequiredApprovals}}
-					</div>
-				{{else if .IsBlockedByRejection}}
-					<div class="item tw-text-red">
-						{{svg "octicon-x"}}
-						{{ctx.Locale.Tr "repo.pulls.blocked_by_rejection"}}
-					</div>
-				{{else if .IsBlockedByOfficialReviewRequests}}
-					<div class="item tw-text-red">
-						{{svg "octicon-x"}}
-						{{ctx.Locale.Tr "repo.pulls.blocked_by_official_review_requests"}}
-					</div>
-				{{else if .IsBlockedByOutdatedBranch}}
-					<div class="item tw-text-red">
-						{{svg "octicon-x"}}
-						{{ctx.Locale.Tr "repo.pulls.blocked_by_outdated_branch"}}
-					</div>
-				{{else if .IsBlockedByChangedProtectedFiles}}
-					<div class="item tw-text-red">
-						{{svg "octicon-x"}}
-						{{ctx.Locale.TrN $.ChangedProtectedFilesNum "repo.pulls.blocked_by_changed_protected_files_1" "repo.pulls.blocked_by_changed_protected_files_n"}}
-					</div>
-					<ul>
-						{{range .ChangedProtectedFiles}}
-						<li>{{.}}</li>
-						{{end}}
-					</ul>
-				{{else if and .EnableStatusCheck (not $requiredStatusCheckState.IsSuccess)}}
-					<div class="item tw-text-red">
-						{{svg "octicon-x"}}
-						{{ctx.Locale.Tr "repo.pulls.required_status_check_failed"}}
-					</div>
-				{{else if and .RequireSigned (not .WillSign)}}
-					<div class="item tw-text-red">
-						{{svg "octicon-x"}}
-						{{ctx.Locale.Tr "repo.pulls.require_signed_wont_sign"}}
-					</div>
-				{{else}}
-					<div class="item tw-text-red">
-						{{svg "octicon-x"}}
-						{{ctx.Locale.Tr "repo.pulls.cannot_auto_merge_desc"}}
-					</div>
-					<div class="item">
-						{{svg "octicon-info"}}
-						{{ctx.Locale.Tr "repo.pulls.cannot_auto_merge_helper"}}
-					</div>
-				{{end}}
-			{{end}}{{/* end if: pull request status */}}
-
-			{{/* Manually Merged is not a well-known feature, it is used to mark a non-mergeable PR (already merged, conflicted) as merged
-			To test it:
-			* Enable "Manually Merged" feature in the Repository Settings
-			* Create a pull request, either:
-			* - Merge the pull request branch locally and push the merged commit to Gitea
-			* - Make some conflicts between the base branch and the pull request branch
-			* Then the Manually Merged form will be shown in the merge form
-			*/}}
-			{{if and $.StillCanManualMerge (not $showGeneralMergeForm)}}
-				<div class="divider"></div>
-				<form class="ui form form-fetch-action" action="{{.Issue.Link}}/merge" method="post">{{/* another similar form is in PullRequestMergeForm.vue*/}}
-					<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 class="ui compact button" data-global-init="initPullRequestWipToggle" data-title="{{.Issue.Title}}" data-wip-prefix="{{.WorkInProgressPrefix}}" data-update-url="{{.Issue.Link}}/title">
+						{{ctx.Locale.Tr "repo.pulls.remove_prefix" .WorkInProgressPrefix}}
 					</button>
-				</form>
+					{{end}}
+				</div>
 			{{end}}
 
-			{{if and .Issue.PullRequest.HeadRepo (not .Issue.PullRequest.HasMerged) (not .Issue.IsClosed)}}
-				{{template "repo/issue/view_content/pull_merge_instruction" dict "PullRequest" .Issue.PullRequest "ShowMergeInstructions" .ShowMergeInstructions}}
+			{{if $data.MergeFormProps}}
+				{{/* The merge form is a Vue component. After mounted, it has a button for choosing merge style, so make it have min-height to avoid layout shifting */}}
+				<div class="item">
+					<div id="pull-request-merge-form" class="tw-min-h-[40px] tw-w-full" data-merge-form-props="{{JsonUtils.EncodeToString $data.MergeFormProps}}"></div>
+				</div>
 			{{end}}
+
+			{{if $data.ShowPullCommands}}
+				<div class="item">
+					{{template "repo/issue/view_content/pull_merge_instruction" dict "PullRequest" .Issue.PullRequest "MergeBoxData" $data}}
+				</div>
+			{{end}}
+			</div>
 		</div>
 	</div>
 </div>

package/gitea/source/templates/repo/issue/view_content/pull_merge_instruction.tmpl

@@ -1,57 +1,63 @@
-<div class="divider"></div>
+{{$data := $.MergeBoxData}}
+{{$pull := $.PullRequest}}
 <details>
-	<summary>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_hint"}}</summary>
-	<div class="tw-mt-2">
-		<div><h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_title"}}</h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_desc"}}</div>
-		{{$localBranch := .PullRequest.HeadBranch}}
-		{{if ne .PullRequest.HeadRepo.ID .PullRequest.BaseRepo.ID}}
-			{{$localBranch = print .PullRequest.HeadRepo.OwnerName "-" .PullRequest.HeadBranch}}
+	<summary class="tw-pl-1">{{/* align with other item icon & text */}}
+		<span class="tw-pl-2">{{ctx.Locale.Tr "repo.pulls.cmd_instruction_hint"}}</span>
+	</summary>
+	<div class="tw-my-[5px]">
+		<div>
+			<h3 class="tw-m-0">{{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_title"}}</h3>
+			{{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_desc"}}
+		</div>
+		{{$localBranch := $pull.HeadBranch}}
+		{{if ne $pull.HeadRepo.ID $pull.BaseRepo.ID}}
+			{{$localBranch = print $pull.HeadRepo.OwnerName "-" $pull.HeadBranch}}
 		{{end}}
 		<div class="ui secondary segment tw-font-mono">
 			{{$gitRemoteName := ctx.RootData.SystemConfig.Repository.GitGuideRemoteName.Value ctx}}
-			{{if eq .PullRequest.Flow 0}}
-			<div>git fetch -u {{if ne .PullRequest.HeadRepo.ID .PullRequest.BaseRepo.ID}}{{ctx.AppFullLink .PullRequest.HeadRepo.Link}}{{else}}{{$gitRemoteName}}{{end}} {{.PullRequest.HeadBranch}}:{{$localBranch}}</div>
+			{{if eq $pull.Flow 0}}
+			<div>git fetch -u {{if ne $pull.HeadRepo.ID $pull.BaseRepo.ID}}{{$pull.HeadRepo.HTMLURL ctx}}{{else}}{{$gitRemoteName}}{{end}} {{$pull.HeadBranch}}:{{$localBranch}}</div>
 			{{else}}
-			<div>git fetch -u {{$gitRemoteName}} {{.PullRequest.GetGitHeadRefName}}:{{$localBranch}}</div>
+			<div>git fetch -u {{$gitRemoteName}} {{$pull.GetGitHeadRefName}}:{{$localBranch}}</div>
 			{{end}}
 			<div>git checkout {{$localBranch}}</div>
 		</div>
-		{{if .ShowMergeInstructions}}
+		{{if $data.ShowMergeInstructions}}
 		<div>
-			<h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_title"}}</h3>
+			<h3 class="tw-m-0">{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_title"}}</h3>
 			{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_desc"}}
-			{{if not .AutodetectManualMerge}}
+			{{if not $data.AutodetectManualMerge}}
 				<div>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_warning"}}</div>
 			{{end}}
 		</div>
 		<div class="ui secondary segment tw-font-mono">
 			<div data-pull-merge-style="merge">
-				<div>git checkout {{.PullRequest.BaseBranch}}</div>
+				<div>git checkout {{$pull.BaseBranch}}</div>
 				<div>git merge --no-ff {{$localBranch}}</div>
 			</div>
 			<div class="tw-hidden" data-pull-merge-style="rebase">
-				<div>git checkout {{.PullRequest.BaseBranch}}</div>
+				<div>git checkout {{$pull.BaseBranch}}</div>
 				<div>git merge --ff-only {{$localBranch}}</div>
 			</div>
 			<div class="tw-hidden" data-pull-merge-style="rebase-merge">
 				<div>git checkout {{$localBranch}}</div>
-				<div>git rebase {{.PullRequest.BaseBranch}}</div>
-				<div>git checkout {{.PullRequest.BaseBranch}}</div>
+				<div>git rebase {{$pull.BaseBranch}}</div>
+				<div>git checkout {{$pull.BaseBranch}}</div>
 				<div>git merge --no-ff {{$localBranch}}</div>
 			</div>
 			<div class="tw-hidden" data-pull-merge-style="squash">
-				<div>git checkout {{.PullRequest.BaseBranch}}</div>
+				<div>git checkout {{$pull.BaseBranch}}</div>
 				<div>git merge --squash {{$localBranch}}</div>
 			</div>
 			<div class="tw-hidden" data-pull-merge-style="fast-forward-only">
-				<div>git checkout {{.PullRequest.BaseBranch}}</div>
+				<div>git checkout {{$pull.BaseBranch}}</div>
 				<div>git merge --ff-only {{$localBranch}}</div>
 			</div>
 			<div class="tw-hidden" data-pull-merge-style="manually-merged">
-				<div>git checkout {{.PullRequest.BaseBranch}}</div>
+				<div>git checkout {{$pull.BaseBranch}}</div>
 				<div>git merge {{$localBranch}}</div>
 			</div>
-			<div>git push {{$gitRemoteName}} {{.PullRequest.BaseBranch}}</div>
+			<div>git push {{$gitRemoteName}} {{$pull.BaseBranch}}</div>
 		</div>
 		{{end}}
 	</div>

package/gitea/source/templates/repo/issue/view_content/pull_merge_status_checks.tmpl

@@ -0,0 +1,34 @@
+{{/* Template Attributes:
+* StatusCheckData: see backend pullCommitStatusCheckData struct
+*/}}
+{{$statusCheckData := $.StatusCheckData}}
+{{if $statusCheckData}}
+	{{$commitStatuses := $statusCheckData.PullCommitStatuses}}
+	<div class="item flex-left-right commit-status-toggle">
+		<div>{{$statusCheckData.CommitStatusCheckPrompt ctx.Locale}}</div>
+		<button data-global-click="onCommitStatusChecksToggle" class="btn interact-fg"
+						data-show-all="{{ctx.Locale.Tr "repo.pulls.status_checks_show_all"}}"
+						data-hide-all="{{ctx.Locale.Tr "repo.pulls.status_checks_hide_all"}}"
+		>{{ctx.Locale.Tr "repo.pulls.status_checks_hide_all"}}</button>
+	</div>
+
+	{{if $statusCheckData.RequireApprovalRunCount}}
+	<div class="item flex-left-right" id="approve-status-checks">
+		<div>
+			<strong>{{ctx.Locale.Tr "repo.pulls.status_checks_need_approvals" $statusCheckData.RequireApprovalRunCount}}</strong>
+			<p>{{ctx.Locale.Tr "repo.pulls.status_checks_need_approvals_helper"}}</p>
+		</div>
+		{{if $statusCheckData.CanApprove}}
+		<button class="ui basic button link-action" data-url="{{$statusCheckData.ApproveLink}}">
+			{{ctx.Locale.Tr "repo.pulls.status_checks_approve_all"}}
+		</button>
+		{{end}}
+	</div>
+	{{end}}
+
+	<div class="item tw-p-0">
+		<div class="commit-status-list flex-divided-list items-px-default">
+			{{template "repo/pulls/status_items" (dict "CommitStatuses" $commitStatuses "StatusCheckData" $statusCheckData)}}
+		</div>
+	</div>
+{{end}}

package/gitea/source/templates/repo/issue/view_content/update_branch_by_merge.tmpl

@@ -1,36 +1,24 @@
-{{if and (gt $.Issue.PullRequest.CommitsBehind 0) (not $.Issue.IsClosed) (not $.Issue.PullRequest.IsChecking) (not $.IsPullFilesConflicted) (not $.IsPullRequestBroken)}}
-	<div class="divider"></div>
-	<div class="item item-section">
-		<div class="item-section-left flex-text-inline">
-			{{svg "octicon-alert"}}
-			{{ctx.Locale.Tr "repo.pulls.outdated_with_base_branch"}}
-		</div>
-		<div class="item-section-right">
-			{{if and $.UpdateAllowed $.UpdateByRebaseAllowed}}
-				<div class="tw-inline-block">
-					<div id="update-pr-branch-with-base" class="ui buttons">
-						<button class="ui button" data-do="{{$.Issue.Link}}/update" data-redirect="{{$.Issue.Link}}">
-							<span class="button-text">
-								{{ctx.Locale.Tr "repo.pulls.update_branch"}}
-							</span>
-						</button>
-						<div class="ui dropdown icon button">
-							{{svg "octicon-triangle-down"}}
-							<div class="menu">
-								<a class="item active selected" data-do="{{$.Issue.Link}}/update">{{ctx.Locale.Tr "repo.pulls.update_branch"}}</a>
-								<a class="item" data-do="{{$.Issue.Link}}/update?style=rebase">{{ctx.Locale.Tr "repo.pulls.update_branch_rebase"}}</a>
-							</div>
-						</div>
-					</div>
-				</div>
-			{{end}}
-			{{if and $.UpdateAllowed (not $.UpdateByRebaseAllowed)}}
-				<form action="{{$.Issue.Link}}/update" method="post" class="ui update-branch-form">
-					<button class="ui compact button">
-						<span class="ui text">{{ctx.Locale.Tr "repo.pulls.update_branch"}}</span>
-					</button>
-				</form>
-			{{end}}
-		</div>
+{{$data := $.MergeBoxData}}
+<div class="tw-w-full flex-left-right">
+	<div class="flex-text-block">
+		{{svg "octicon-alert"}}
+		{{ctx.Locale.Tr "repo.pulls.outdated_with_base_branch"}}
 	</div>
-{{end}}
+	{{if $data.UpdatePrimaryAction}}
+	<div class="ui buttons"{{if $data.UpdateStyleOptions}} data-global-init="initRepoPullRequestUpdate"{{end}}>
+		<button class="ui button link-action" data-url="{{$data.UpdatePrimaryAction.URL}}">
+			{{$data.UpdatePrimaryAction.Text}}
+		</button>
+		{{if gt (len $data.UpdateStyleOptions) 1}}
+		<div class="ui dropdown icon button">
+			{{svg "octicon-triangle-down"}}
+			<div class="menu">
+				{{range $data.UpdateStyleOptions}}
+					<a class="item {{if .Selected}}selected{{end}}" data-update-url="{{.URL}}">{{.Text}}</a>
+				{{end}}
+			</div>
+		</div>
+		{{end}}
+	</div>
+	{{end}}
+</div>

package/gitea/source/templates/repo/issue/view_content/watching.tmpl

@@ -1,12 +1,7 @@
-<form hx-boost="true" hx-sync="this:replace" hx-target="this" method="post" action="{{.Issue.Link}}/watch">
-	<input type="hidden" name="watch" value="{{if $.IssueWatch.IsWatching}}0{{else}}1{{end}}">
-	<button class="fluid ui button">
-		{{if $.IssueWatch.IsWatching}}
-			{{svg "octicon-mute" 16}}
-			{{ctx.Locale.Tr "repo.issues.unsubscribe"}}
-		{{else}}
-			{{svg "octicon-unmute" 16}}
-			{{ctx.Locale.Tr "repo.issues.subscribe"}}
-		{{end}}
-	</button>
-</form>
+<button class="fluid ui button" type="button" data-fetch-method="post" data-fetch-url="{{.Issue.Link}}/watch?watch={{not $.IssueWatch.IsWatching}}">
+	{{if $.IssueWatch.IsWatching}}
+		{{svg "octicon-mute" 16}} {{ctx.Locale.Tr "repo.issues.unsubscribe"}}
+	{{else}}
+		{{svg "octicon-unmute" 16}} {{ctx.Locale.Tr "repo.issues.subscribe"}}
+	{{end}}
+</button>