summaryrefslogtreecommitdiff
path: root/lib/gitlab/analytics
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/analytics')
-rw-r--r--lib/gitlab/analytics/cycle_analytics/aggregated/data_collector.rb2
-rw-r--r--lib/gitlab/analytics/cycle_analytics/data_collector.rb2
-rw-r--r--lib/gitlab/analytics/cycle_analytics/request_params.rb6
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/gitlab/analytics/cycle_analytics/aggregated/data_collector.rb b/lib/gitlab/analytics/cycle_analytics/aggregated/data_collector.rb
index 22d8874db57..3abf380d461 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::GroupStage
+ # stage - an instance of CycleAnalytics::ProjectStage or CycleAnalytics::Stage
# params:
# current_user: an instance of User
# from: DateTime
diff --git a/lib/gitlab/analytics/cycle_analytics/data_collector.rb b/lib/gitlab/analytics/cycle_analytics/data_collector.rb
index ae675b6ad27..0db027b9861 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::GroupStage
+ # stage - an instance of CycleAnalytics::ProjectStage or CycleAnalytics::Stage
# params:
# current_user: an instance of User
# from: DateTime
diff --git a/lib/gitlab/analytics/cycle_analytics/request_params.rb b/lib/gitlab/analytics/cycle_analytics/request_params.rb
index ac9c465bf7d..d058782ae87 100644
--- a/lib/gitlab/analytics/cycle_analytics/request_params.rb
+++ b/lib/gitlab/analytics/cycle_analytics/request_params.rb
@@ -106,7 +106,7 @@ module Gitlab
def use_aggregated_backend?
# for now it's only available on the group-level
- group.present? && aggregation.enabled
+ group.present?
end
def aggregation_attributes
@@ -118,14 +118,14 @@ module Gitlab
end
def aggregation
- @aggregation ||= ::Analytics::CycleAnalytics::Aggregation.safe_create_for_group(group)
+ @aggregation ||= ::Analytics::CycleAnalytics::Aggregation.safe_create_for_namespace(group)
end
def group_data_attributes
{
id: group.id,
+ namespace_id: group.id,
name: group.name,
- parent_id: group.parent_id,
full_path: group.full_path,
avatar_url: group.avatar_url
}