Use lazy reference extractor to get issue's MRslazy-reference-extractor

2 files changed, 6 insertions, 6 deletions

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 9f4f4923e58..4571d7f0ee1 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -84,11 +84,11 @@ class Issue < ActiveRecord::Base
   end
 
   def referenced_merge_requests
-    references = [self, *notes].flat_map do |note|
-      note.all_references(load_lazy_references: false).merge_requests
-    end.uniq
-
-    Banzai::LazyReference.load(references).uniq.sort_by(&:iid)
+    Gitlab::ReferenceExtractor.lazily do
+      [self, *notes].flat_map do |note|
+        note.all_references(load_lazy_references: false).merge_requests
+      end
+    end.sort_by(&:iid)
   end
 
   # Reset issue events cache
diff --git a/lib/banzai/reference_extractor.rb b/lib/banzai/reference_extractor.rb
index 8ae5b890953..2c197d31898 100644
--- a/lib/banzai/reference_extractor.rb
+++ b/lib/banzai/reference_extractor.rb
@@ -11,7 +11,7 @@ module Banzai
       end
 
       def lazily(values = nil, &block)
-        return values || block.call if lazy?
+        return (values || block.call).uniq if lazy?
 
         begin
           Thread.current[LAZY_KEY] = true