Reduce number of queries when calling GlobalMilestone#{labels,participants}

1 files changed, 12 insertions, 2 deletions

diff --git a/app/models/global_milestone.rb b/app/models/global_milestone.rb
index 81b7343d7ad..8f38a2b6254 100644
--- a/app/models/global_milestone.rb
+++ b/app/models/global_milestone.rb
@@ -61,11 +61,11 @@ class GlobalMilestone
   end
 
   def participants
-    @participants ||= milestones.map(&:participants).flatten.compact.uniq
+    @participants ||= milestones_relation.includes(:participants).map(&:participants).flatten.compact.uniq
   end
 
   def labels
-    @labels ||= GlobalLabel.build_collection(milestones.map(&:labels).flatten)
+    @labels ||= GlobalLabel.build_collection(milestones_relation.includes(:labels).map(&:labels).flatten)
                            .sort_by!(&:title)
   end
 
@@ -89,4 +89,14 @@ class GlobalMilestone
       end
     end
   end
+
+  private
+
+  def milestones_relation
+    @milestones_relation ||= if milestones.is_a?(ActiveRecord::Relation)
+                               milestones
+                             else
+                               Milestone.where(id: milestones.map(&:id))
+                             end
+  end
 end