diff --git a/server/events/vcs/gitlab_client.go b/server/events/vcs/gitlab_client.go index 7f19b2b78e..84d71c9c4a 100644 --- a/server/events/vcs/gitlab_client.go +++ b/server/events/vcs/gitlab_client.go @@ -313,7 +313,7 @@ func (g *GitlabClient) PullIsMergeable(repo models.Repo, pull models.PullRequest retryLimit := 3 for attempt := 0; attempt < retryLimit; attempt++ { if ((ok && (mr.DetailedMergeStatus == "mergeable" || mr.DetailedMergeStatus == "ci_still_running")) || - (!ok && mr.MergeStatus == "can_be_merged")) && + (!ok && mr.DetailedMergeStatus == "can_be_merged")) && mr.ApprovalsBeforeMerge <= 0 && mr.BlockingDiscussionsResolved && !mr.WorkInProgress &&