From a3804f06fd3b44e5577f5eca5f50d0b9a8bcde29 Mon Sep 17 00:00:00 2001
From: nitrocode <7775707+nitrocode@users.noreply.github.com>
Date: Mon, 6 Feb 2023 23:12:02 -0600
Subject: [PATCH] bugfix(gitlab): correct detailed merge status check (#3067)

---
 server/events/vcs/gitlab_client.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/events/vcs/gitlab_client.go b/server/events/vcs/gitlab_client.go
index e530ab8003..8b0ded3866 100644
--- 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 &&