From 699cc47485bb00fb10e42e391c0c95ff780bf417 Mon Sep 17 00:00:00 2001
From: limiting-factor <limiting-factor@posteo.com>
Date: Thu, 28 May 2026 11:50:15 +0200
Subject: [PATCH] fix: always display the pull request merge box if there are
 actions pending approvals

For the same reason the merge box is displayed when the user can
delete the branch from which the pull request was proposed, the trust
panel must be displayed when runs are waiting approval, either for
information or to approve/deny runs from untrusted users.

Closes forgejo/forgejo#12576
---
 templates/repo/issue/view_content/pull.tmpl | 4 +---
 tests/integration/actions_trust_test.go     | 4 ++++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
index e1bdf76454..5c41f5e017 100644
--- a/templates/repo/issue/view_content/pull.tmpl
+++ b/templates/repo/issue/view_content/pull.tmpl
@@ -4,9 +4,7 @@
 {{$manualMergeStyleAllowed := $prConfig.AllowManualMerge}}
 {{$hasUnsignedMergeStyle := or $fastForwardStyleAllowed $manualMergeStyleAllowed}}
 {{$signingBlocksAllMergeStyles := and .AllowMerge .RequireSigned (not .WillSign) (not $hasUnsignedMergeStyle)}}
-{{if and .Issue.PullRequest.HasMerged (not .IsPullBranchDeletable)}}
-{{/* Then the merge box will not be displayed because this page already contains enough information */}}
-{{else}}
+{{if or (not .Issue.PullRequest.HasMerged) .IsPullBranchDeletable .SomePullRequestRunsNeedApproval}}
 <div class="timeline-item comment merge box">
 	<div class="timeline-avatar text {{if .Issue.PullRequest.HasMerged}}purple
 	{{- else if .Issue.IsClosed}}grey
diff --git a/tests/integration/actions_trust_test.go b/tests/integration/actions_trust_test.go
index 3c334e0d8c..d08f427168 100644
--- a/tests/integration/actions_trust_test.go
+++ b/tests/integration/actions_trust_test.go
@@ -486,6 +486,10 @@ func TestActionsPullRequestTrustPanelMergedOrClosed(t *testing.T) {
 		t.Run("Regular user sees pending approval even though PR is a merged PR", func(t *testing.T) {
 			actionsTrustTestAssertTrustPanel(t, regularSession, pullRequestLink)
 		})
+		t.Run("Owner user sees pending approval even though PR is a merged PR", func(t *testing.T) {
+			ownerSession := loginUser(t, ownerUser.Name)
+			actionsTrustTestAssertTrustPanel(t, ownerSession, pullRequestLink)
+		})
 	})
 }