Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-01-24 21:11:44 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-01-24 21:11:44 +0300
commitfd247970cfe1e98276c780fbdcca026b7960e42a (patch)
treeab7963eb9b30fd73283c526cb6ae4ca1ef61c06f /lib/gitlab/analytics
parentdf9890e9a702e2f12bbc8f022b916ca72820a292 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/analytics')
-rw-r--r--lib/gitlab/analytics/cycle_analytics/base_query_builder.rb11
1 files changed, 8 insertions, 3 deletions
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)