Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+7 −2
Open

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5729e1
Pull Request Merge Text should exclude dismissed reviews if only offi…
6543 Sep 16, 2025
2bdf87f
as title now
6543 Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions models/issues/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down