Update server/events/vcs/gitlab_client.go

chore: simplify ignored statuses logic Co-authored-by: Emil 'Skeen' Madsen <[email protected]>
runatlantis · May 13, 2022 · 7d61513 · 7d61513
1 parent 2cc24a8
commit 7d61513
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/server/events/vcs/gitlab_client.go b/server/events/vcs/gitlab_client.go
@@ -212,10 +212,11 @@ func (g *GitlabClient) PullIsMergeable(repo models.Repo, pull models.PullRequest
 	}
 
 	for _, status := range statuses {
-		if !strings.HasPrefix(status.Name, fmt.Sprintf("atlantis/%s", command.Apply.String())) {
-			if !status.AllowFailure && project.OnlyAllowMergeIfPipelineSucceeds && status.Status != "success" {
-				return false, nil
-			}
+		if strings.HasPrefix(status.Name, fmt.Sprintf("atlantis/%s", command.Apply.String())) {
+			continue
+		}
+		if !status.AllowFailure && project.OnlyAllowMergeIfPipelineSucceeds && status.Status != "success" {
+			return false, nil
 		}
 	}