fix: Updating the DetailedMergeStatus

gojekfarm · Feb 26, 2024 · 92c1129 · 92c1129
1 parent 2648f2d
commit 92c1129
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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 &&