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

Remove duplicates from issue related merge requests

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

1 files changed, 12 insertions, 0 deletions

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)