Skip to content

Commit

Permalink
fix: typo
Browse files Browse the repository at this point in the history
  • Loading branch information
CaioAugustoo committed Dec 7, 2024
1 parent ff08435 commit 83cc9cd
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions server/events/vcs/gitlab_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ func (g *GitlabClient) PullIsApproved(logger logging.SimpleLogging, repo models.

// PullIsMergeable returns true if the merge request can be merged.
// In GitLab, there isn't a single field that tells us if the pull request is
// mergeable so for now we check the merge_status and ApprovalsLeft
// mergeable so for now we check the merge_status and approvals_left
// fields.
// In order to check if the repo required these, we'd need to make another API
// call to get the repo settings.
Expand Down Expand Up @@ -372,7 +372,7 @@ func (g *GitlabClient) PullIsMergeable(logger logging.SimpleLogging, repo models
mr.DetailedMergeStatus == "need_rebase")) ||
(!supportsDetailedMergeStatus &&
mr.MergeStatus == "can_be_merged")) && //nolint:staticcheck // Need to reference deprecated field for backwards compatibility
approval.ApprovalsLeft <= 0 &&
approval.ApprovalsLeft == 0 &&
mr.BlockingDiscussionsResolved &&
!mr.WorkInProgress &&
(allowSkippedPipeline || !isPipelineSkipped) {
Expand Down

0 comments on commit 83cc9cd

Please sign in to comment.