Commit 181a2179 authored by Markus Koller's avatar Markus Koller

Merge branch 'aa-fix-monthly-time-period-method-name' into 'master'

Last 28 days time period name

See merge request gitlab-org/gitlab!35532
parents 11525135 d21ca15d
...@@ -39,7 +39,7 @@ module Gitlab ...@@ -39,7 +39,7 @@ module Gitlab
.merge(object_store_usage_data) .merge(object_store_usage_data)
.merge(topology_usage_data) .merge(topology_usage_data)
.merge(usage_activity_by_stage) .merge(usage_activity_by_stage)
.merge(usage_activity_by_stage(:usage_activity_by_stage_monthly, default_time_period)) .merge(usage_activity_by_stage(:usage_activity_by_stage_monthly, last_28_days_time_period))
.merge(analytics_unique_visits_data) .merge(analytics_unique_visits_data)
end end
end end
...@@ -160,7 +160,7 @@ module Gitlab ...@@ -160,7 +160,7 @@ module Gitlab
user_preferences_usage, user_preferences_usage,
ingress_modsecurity_usage, ingress_modsecurity_usage,
container_expiration_policies_usage, container_expiration_policies_usage,
merge_requests_usage(default_time_period) merge_requests_usage(last_28_days_time_period)
).tap do |data| ).tap do |data|
data[:snippets] = data[:personal_snippets] + data[:project_snippets] data[:snippets] = data[:personal_snippets] + data[:project_snippets]
end end
...@@ -171,8 +171,8 @@ module Gitlab ...@@ -171,8 +171,8 @@ module Gitlab
def system_usage_data_monthly def system_usage_data_monthly
{ {
counts_monthly: { counts_monthly: {
personal_snippets: count(PersonalSnippet.where(default_time_period)), personal_snippets: count(PersonalSnippet.where(last_28_days_time_period)),
project_snippets: count(ProjectSnippet.where(default_time_period)) project_snippets: count(ProjectSnippet.where(last_28_days_time_period))
}.tap do |data| }.tap do |data|
data[:snippets] = data[:personal_snippets] + data[:project_snippets] data[:snippets] = data[:personal_snippets] + data[:project_snippets]
end end
...@@ -433,7 +433,7 @@ module Gitlab ...@@ -433,7 +433,7 @@ module Gitlab
end end
end end
def default_time_period def last_28_days_time_period
{ created_at: 28.days.ago..Time.current } { created_at: 28.days.ago..Time.current }
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment