Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-11-06 21:00:52 +01:00
Code Issues Activity

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

Browse Source
This commit is contained in:
6543 2025-09-16 16:19:16 +02:00
parent 9332ff291b
commit e5729e1ce5
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/issues/pull.go
View File

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