From a89ae0942216bf22220a1ea295567f61acb9364f Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Thu, 1 Dec 2022 14:39:09 +0100
Subject: [PATCH] fixes #30

---
 controllers/dashboard.php | 5 +----
 lib/GitlabIssue.php       | 9 ++++-----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/controllers/dashboard.php b/controllers/dashboard.php
index f27c363..775e77c 100644
--- a/controllers/dashboard.php
+++ b/controllers/dashboard.php
@@ -138,10 +138,7 @@ final class DashboardController extends TracToGitlab\Controller
         });
 
         return array_map(function ($issue) {
-            $mrs = [];
-            if ($issue['merge_requests_count'] > 0) {
-                $mrs = $this->gitlab->issues()->relatedMergeRequests($this->gitlabProjectId, $issue['iid']);
-            }
+            $mrs = $this->gitlab->issues()->relatedMergeRequests($this->gitlabProjectId, $issue['iid']);
             return new TracToGitlab\GitlabIssue($issue, $mrs);
         }, $issues);
     }
diff --git a/lib/GitlabIssue.php b/lib/GitlabIssue.php
index 1b1e7bf..9571ec2 100644
--- a/lib/GitlabIssue.php
+++ b/lib/GitlabIssue.php
@@ -59,10 +59,9 @@ final class GitlabIssue implements \JsonSerializable
 
     public function isMerged()
     {
-        return $this->hasMergeRequests()
-            && count(array_filter($this->mrs, function ($mr) {
-                return $mr['state'] !== 'merged';
-            })) === 0;
+        return count(array_filter($this->mrs, function ($mr) {
+            return $mr['state'] !== 'merged';
+        })) === 0;
     }
 
     public function isBiest()
@@ -116,7 +115,7 @@ final class GitlabIssue implements \JsonSerializable
             'assignee' => $this->assignee,
             'web_url' => $this->web_url,
             'closed' => $this->isClosed(),
-            'merge_requests' => $this->issue['merge_requests_count'],
+            'merge_requests' => count($this->mrs),
             'merged' => $this->isMerged(),
             'qm_states' => array_combine(
                 array_values(self::QM_LABEL_MAPPING),
-- 
GitLab