diff --git a/server/events/vcs/gitlab_client.go b/server/events/vcs/gitlab_client.go index 3abff3adfe..d3f32373c1 100644 --- a/server/events/vcs/gitlab_client.go +++ b/server/events/vcs/gitlab_client.go @@ -208,6 +208,7 @@ func (g *GitlabClient) PullIsMergeable(repo models.Repo, pull models.PullRequest if mr.MergeStatus == "can_be_merged" && mr.ApprovalsBeforeMerge <= 0 && mr.BlockingDiscussionsResolved && + !mr.WorkInProgress && (allowSkippedPipeline || !isPipelineSkipped) { return true, nil }