Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

1 files changed, 6 insertions, 0 deletions

diff --git a/app/models/analytics/cycle_analytics/project_stage.rb b/app/models/analytics/cycle_analytics/project_stage.rb
index e8b03fa066a..8d3a032812e 100644
--- a/app/models/analytics/cycle_analytics/project_stage.rb
+++ b/app/models/analytics/cycle_analytics/project_stage.rb
@@ -26,6 +26,12 @@ module Analytics
         :project_id
       end
 
+      def self.distinct_stages_within_hierarchy(group)
+        with_preloaded_labels
+          .where(project_id: group.all_projects.select(:id))
+          .select("DISTINCT ON(stage_event_hash_id) #{quoted_table_name}.*")
+      end
+
       private
 
       # Project should belong to a group when the stage has Label based events since only GroupLabels are allowed.