0
0
mirror of https://github.com/go-gitea/gitea.git synced 2025-11-01 15:48:38 +01:00

Merge 8db044aa86db5ba48907b66d74ec849b1c96f5bb into 3ab8ae5807775a81069005a5abbd20bacfa0a15f

This commit is contained in:
6543 2025-10-30 04:51:04 +01:00 committed by GitHub
commit 879fd83823
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

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"
@ -375,11 +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,
})
}
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