From fe99252ac2e2bb4bb9213649c6109a1d87e7d86d Mon Sep 17 00:00:00 2001
From: Mohamed Habib <moe.habib9@gmail.com>
Date: Mon, 8 Jul 2024 19:04:06 +0100
Subject: [PATCH] Feat/gitlab support2 (#1609)

* provide gitlab fixes
---
 libs/ci/gitlab/gitlab.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/libs/ci/gitlab/gitlab.go b/libs/ci/gitlab/gitlab.go
index d9454abca..7d2731e27 100644
--- a/libs/ci/gitlab/gitlab.go
+++ b/libs/ci/gitlab/gitlab.go
@@ -220,7 +220,16 @@ func (gitlabService GitLabService) MergePullRequest(mergeRequestID int) error {
 }
 
 func (gitlabService GitLabService) IsMergeable(mergeRequestID int) (bool, error) {
-	return gitlabService.Context.IsMeargeable, nil
+	opt := &go_gitlab.GetMergeRequestsOptions{}
+	mergeRequest, _, err := gitlabService.Client.MergeRequests.GetMergeRequest(*gitlabService.Context.ProjectId, *gitlabService.Context.MergeRequestIId, opt)
+	if err != nil {
+		log.Printf("could not get gitlab mergability status %v", err)
+		return false, fmt.Errorf("could not get gitlab mergability status: %v", err)
+	}
+	if mergeRequest.DetailedMergeStatus == "mergeable" {
+		return true, nil
+	}
+	return false, nil
 }
 
 func (gitlabService GitLabService) IsClosed(mergeRequestID int) (bool, error) {