Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42

6 files changed, 14 insertions, 9 deletions

diff --git a/lib/gitlab/analytics/cycle_analytics/aggregated/base_query_builder.rb b/lib/gitlab/analytics/cycle_analytics/aggregated/base_query_builder.rb
index dd8149aba94..41f94e79f91 100644
--- a/lib/gitlab/analytics/cycle_analytics/aggregated/base_query_builder.rb
+++ b/lib/gitlab/analytics/cycle_analytics/aggregated/base_query_builder.rb
@@ -24,7 +24,7 @@ module Gitlab
           def initialize(stage:, params: {})
             @stage = stage
             @params = params
-            @root_ancestor = stage.parent.root_ancestor
+            @root_ancestor = stage.namespace.root_ancestor
             @stage_event_model = MODEL_CLASSES.fetch(stage.subject_class.to_s)
           end
 
@@ -90,7 +90,7 @@ module Gitlab
           end
 
           def filter_by_stage_parent(query)
-            query.by_project_id(stage.parent_id)
+            query.by_project_id(stage.namespace.project.id)
           end
 
           def base_query
diff --git a/lib/gitlab/analytics/cycle_analytics/aggregated/data_collector.rb b/lib/gitlab/analytics/cycle_analytics/aggregated/data_collector.rb
index 3abf380d461..8b40a8c2b26 100644
--- a/lib/gitlab/analytics/cycle_analytics/aggregated/data_collector.rb
+++ b/lib/gitlab/analytics/cycle_analytics/aggregated/data_collector.rb
@@ -5,7 +5,7 @@ module Gitlab
     module CycleAnalytics
       module Aggregated
         # Arguments:
-        #   stage - an instance of CycleAnalytics::ProjectStage or CycleAnalytics::Stage
+        #   stage - an instance of CycleAnalytics::Stage
         #   params:
         #     current_user: an instance of User
         #     from: DateTime
diff --git a/lib/gitlab/analytics/cycle_analytics/base_query_builder.rb b/lib/gitlab/analytics/cycle_analytics/base_query_builder.rb
index c7987d63153..ca8b4a3a890 100644
--- a/lib/gitlab/analytics/cycle_analytics/base_query_builder.rb
+++ b/lib/gitlab/analytics/cycle_analytics/base_query_builder.rb
@@ -57,9 +57,14 @@ module Gitlab
         end
 
         def add_parent_model_params!(finder_params)
-          raise(ArgumentError, "unknown parent_class: #{parent_class}") unless parent_class.eql?(Project)
-
-          finder_params[:project_id] = stage.parent_id
+          case stage.parent
+          when Namespaces::ProjectNamespace
+            finder_params[:project_id] = stage.parent.project.id
+          when Project
+            finder_params[:project_id] = stage.parent_id
+          else
+            raise(ArgumentError, "unknown parent_class: #{parent_class}")
+          end
         end
 
         def add_time_range_params!(finder_params, from, to)
diff --git a/lib/gitlab/analytics/cycle_analytics/data_collector.rb b/lib/gitlab/analytics/cycle_analytics/data_collector.rb
index 0db027b9861..ffafafda4ac 100644
--- a/lib/gitlab/analytics/cycle_analytics/data_collector.rb
+++ b/lib/gitlab/analytics/cycle_analytics/data_collector.rb
@@ -4,7 +4,7 @@ module Gitlab
   module Analytics
     module CycleAnalytics
       # Arguments:
-      #   stage - an instance of CycleAnalytics::ProjectStage or CycleAnalytics::Stage
+      #   stage - an instance of CycleAnalytics::Stage
       #   params:
       #     current_user: an instance of User
       #     from: DateTime
diff --git a/lib/gitlab/analytics/cycle_analytics/default_stages.rb b/lib/gitlab/analytics/cycle_analytics/default_stages.rb
index 43683ae174e..0f1380125fa 100644
--- a/lib/gitlab/analytics/cycle_analytics/default_stages.rb
+++ b/lib/gitlab/analytics/cycle_analytics/default_stages.rb
@@ -6,7 +6,7 @@
 # Example:
 #
 # params = Gitlab::Analytics::CycleAnalytics::DefaultStages.params_for_issue_stage
-# Analytics::CycleAnalytics::ProjectStage.new(params)
+# Analytics::CycleAnalytics::Stage.new(params)
 module Gitlab
   module Analytics
     module CycleAnalytics
diff --git a/lib/gitlab/analytics/cycle_analytics/request_params.rb b/lib/gitlab/analytics/cycle_analytics/request_params.rb
index d058782ae87..2df3680db5f 100644
--- a/lib/gitlab/analytics/cycle_analytics/request_params.rb
+++ b/lib/gitlab/analytics/cycle_analytics/request_params.rb
@@ -196,7 +196,7 @@ module Gitlab
           return unless value_stream
 
           strong_memoize(:stage) do
-            ::Analytics::CycleAnalytics::StageFinder.new(parent: project || group, stage_id: stage_id).execute if stage_id
+            ::Analytics::CycleAnalytics::StageFinder.new(parent: project&.project_namespace || group, stage_id: stage_id).execute if stage_id
           end
         end
       end