From b1d22143d8b3c1ab128dcc7ecbd1bbe963cb060a Mon Sep 17 00:00:00 2001
From: Nicolas Vuillamy <nicolas.vuillamy@gmail.com>
Date: Mon, 24 Jan 2022 11:25:58 +0100
Subject: [PATCH] QuickFix Gitlab Comments reporter for self-hosted instances

---
 megalinter/reporters/GitlabCommentReporter.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/megalinter/reporters/GitlabCommentReporter.py b/megalinter/reporters/GitlabCommentReporter.py
index b3e29814c64..7d454ad49ec 100644
--- a/megalinter/reporters/GitlabCommentReporter.py
+++ b/megalinter/reporters/GitlabCommentReporter.py
@@ -57,12 +57,16 @@ def produce_report(self):
             try:
                 mr = project.mergerequests.get(gitlab_merge_request_id)
             except gitlab.GitlabGetError as e:
-                logging.warning(
-                    "[Gitlab Comment Reporter] No merge request has been found with "
-                    f"id {gitlab_merge_request_id}, so no comment has been posted\n"
-                    + str(e)
-                )
-                return
+                gitlab_merge_request_id = config.get("CI_MERGE_REQUEST_IID", "none")
+                try:
+                    mr = project.mergerequests.get(gitlab_merge_request_id)
+                except gitlab.GitlabGetError as e:
+                    logging.warning(
+                        "[Gitlab Comment Reporter] No merge request has been found with "
+                        f"id {gitlab_merge_request_id}, so no comment has been posted\n"
+                        + str(e)
+                    )
+                    return
 
             # Ignore if PR is already merged
             if mr.state == "merged":