From e5729e1ce55b23c27e87eb3dedfc5cbe6d012d06 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 16 Sep 2025 16:19:16 +0200
Subject: [PATCH 1/2] Pull Request Merge Text should exclude dismissed reviews
 if only official once count

---
 models/issues/pull.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/models/issues/pull.go b/models/issues/pull.go
index 7a37b627e1bd0..f17b6838da215 100644
--- a/models/issues/pull.go
+++ b/models/issues/pull.go
@@ -20,6 +20,7 @@ import (
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/optional"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/timeutil"
 	"code.gitea.io/gitea/modules/util"
@@ -379,6 +380,7 @@ func (pr *PullRequest) getReviewedByLines(ctx context.Context, writer io.Writer)
 		Types:        []ReviewType{ReviewTypeApprove},
 		IssueID:      pr.IssueID,
 		OfficialOnly: setting.Repository.PullRequest.DefaultMergeMessageOfficialApproversOnly,
+		Dismissed:    optional.Some(false),
 	})
 	if err != nil {
 		log.Error("Unable to FindReviews for PR ID %d: %v", pr.ID, err)

From 2bdf87f1809e8771d9b6a5415c50d094bf4ef0e2 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 16 Sep 2025 16:22:36 +0200
Subject: [PATCH 2/2] as title now

---
 models/issues/pull.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/models/issues/pull.go b/models/issues/pull.go
index f17b6838da215..7fce4836c71d6 100644
--- a/models/issues/pull.go
+++ b/models/issues/pull.go
@@ -376,12 +376,15 @@ func (pr *PullRequest) getReviewedByLines(ctx context.Context, writer io.Writer)
 	}
 
 	// Note: This doesn't page as we only expect a very limited number of reviews
-	reviews, err := FindLatestReviews(ctx, FindReviewOptions{
+	opts := FindReviewOptions{
 		Types:        []ReviewType{ReviewTypeApprove},
 		IssueID:      pr.IssueID,
 		OfficialOnly: setting.Repository.PullRequest.DefaultMergeMessageOfficialApproversOnly,
-		Dismissed:    optional.Some(false),
-	})
+	}
+	if setting.Repository.PullRequest.DefaultMergeMessageOfficialApproversOnly {
+		opts.Dismissed = optional.Some(false)
+	}
+	reviews, err := FindLatestReviews(ctx, opts)
 	if err != nil {
 		log.Error("Unable to FindReviews for PR ID %d: %v", pr.ID, err)
 		return err