bugfix(gitlab): correct detailed merge status check (runatlantis#3067)

gocardless · Feb 13, 2024 · a3804f0 · a3804f0
1 parent ef18724
commit a3804f0
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
@@ -221,7 +221,7 @@ func (g *GitlabClient) PullIsMergeable(repo models.Repo, pull models.PullRequest
 
 	isPipelineSkipped := mr.HeadPipeline.Status == "skipped"
 	allowSkippedPipeline := project.AllowMergeOnSkippedPipeline && isPipelineSkipped
-	if mr.DetailedMergeStatus == "mergeable" &&
+	if (mr.DetailedMergeStatus == "mergeable" || mr.DetailedMergeStatus == "ci_still_running") &&
 		mr.ApprovalsBeforeMerge <= 0 &&
 		mr.BlockingDiscussionsResolved &&
 		!mr.WorkInProgress &&