0
0
mirror of https://github.com/go-gitea/gitea.git synced 2025-11-06 14:30:49 +01:00

Pull Request Merge Text should exclude dismissed reviews if only official once count

This commit is contained in:
6543 2025-09-16 16:19:16 +02:00
parent 9332ff291b
commit e5729e1ce5

View File

@ -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)