diff --git a/models/issues/pull.go b/models/issues/pull.go index 4557488167c..91c52250330 100644 --- a/models/issues/pull.go +++ b/models/issues/pull.go @@ -378,7 +378,7 @@ func (pr *PullRequest) getReviewedByLines(ctx context.Context, writer io.Writer) reviewersWritten := 0 for _, review := range reviews { - if maxReviewers > 0 && reviewersWritten > maxReviewers { + if maxReviewers > 0 && reviewersWritten >= maxReviewers { break } diff --git a/models/issues/pull_test.go b/models/issues/pull_test.go index bd7499fa80b..a911d2429a1 100644 --- a/models/issues/pull_test.go +++ b/models/issues/pull_test.go @@ -14,6 +14,7 @@ import ( "gitea.dev/models/unittest" user_model "gitea.dev/models/user" "gitea.dev/modules/setting" + "gitea.dev/modules/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -403,6 +404,10 @@ func testGetApprovers(t *testing.T) { approvers := pr.GetApprovers(t.Context()) expected := "Reviewed-by: User Five \nReviewed-by: Org Six \n" assert.Equal(t, expected, approvers) + + defer test.MockVariableValue(&setting.Repository.PullRequest.DefaultMergeMessageMaxApprovers, 1)() + approvers = pr.GetApprovers(t.Context()) + assert.Equal(t, "Reviewed-by: User Five \n", approvers) } func testGetPullRequestByMergedCommit(t *testing.T) {