Merge branch 'duplicate-related-mrs' into 'master'

Remove duplicates from issue related merge requests

See merge request gitlab-org/gitlab-ce!27067

3 files changed, 18 insertions, 1 deletions

diff --git a/changelogs/unreleased/duplicate-related-mrs.yml b/changelogs/unreleased/duplicate-related-mrs.yml
new file mode 100644
index 00000000000..0f5f6ede9f8
--- /dev/null
+++ b/changelogs/unreleased/duplicate-related-mrs.yml
@@ -0,0 +1,5 @@
+---
+title: Remove duplicates from issue related merge requests
+merge_request: 27067
+author:
+type: fixed
diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index 3dd90502050..999a9cb5a82 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -307,7 +307,7 @@ module API
 
         merge_requests = ::Issues::ReferencedMergeRequestsService.new(user_project, current_user)
           .execute(issue)
-          .flatten
+          .first
 
         present paginate(::Kaminari.paginate_array(merge_requests)),
           with: Entities::MergeRequest,
diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb
index a5434d3ea80..86484ce62f8 100644
--- a/spec/requests/api/issues_spec.rb
+++ b/spec/requests/api/issues_spec.rb
@@ -2189,6 +2189,18 @@ describe API::Issues do
       expect_paginated_array_response(related_mr.id)
     end
 
+    context 'merge request closes an issue' do
+      let!(:closing_issue_mr_rel) do
+        create(:merge_requests_closing_issues, issue: issue, merge_request: related_mr)
+      end
+
+      it 'returns closing MR only once' do
+        get_related_merge_requests(project.id, issue.iid, user)
+
+        expect_paginated_array_response([related_mr.id])
+      end
+    end
+
     context 'no merge request mentioned a issue' do
       it 'returns empty array' do
         get_related_merge_requests(project.id, closed_issue.iid, user)