diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-23 18:00:18 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-23 18:00:18 +0300 |
commit | 6ce82deda34e8af9d07cf7dfff0057f33b9e6187 (patch) | |
tree | e88b7ca57376e83556c7a651d61dbe8ba09440b5 /lib/gitlab/usage_data_counters | |
parent | 3d62fe7ad9b32c2e68d253d0b2bd178215c65fa5 (diff) |
Add latest changes from gitlab-org/gitlab@13-7-stable-ee
Diffstat (limited to 'lib/gitlab/usage_data_counters')
-rw-r--r-- | lib/gitlab/usage_data_counters/hll_redis_counter.rb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/gitlab/usage_data_counters/hll_redis_counter.rb b/lib/gitlab/usage_data_counters/hll_redis_counter.rb index 573ad1dce35..b61720c7638 100644 --- a/lib/gitlab/usage_data_counters/hll_redis_counter.rb +++ b/lib/gitlab/usage_data_counters/hll_redis_counter.rb @@ -336,12 +336,10 @@ module Gitlab end def weekly_redis_keys(events:, start_date:, end_date:, context: '') - weeks = end_date.to_date.cweek - start_date.to_date.cweek - weeks = 1 if weeks == 0 - - (0..(weeks - 1)).map do |week_increment| - events.map { |event| redis_key(event, start_date + week_increment * 7.days, context) } - end.flatten + end_date = end_date.end_of_week - 1.week + (start_date.to_date..end_date.to_date).map do |date| + events.map { |event| redis_key(event, date, context) } + end.flatten.uniq end end end |