diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-05 03:10:20 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-05 03:10:20 +0300 |
commit | b28aa8bd7d9f4289d6e73df2eb9d308b80b70d95 (patch) | |
tree | f2b8ee3eea854b76543b52ca1bc63f46d9ccb2c8 /lib/gitlab/ci/charts.rb | |
parent | 9248363e3eb740b2f1dccb3a63f09aff4fcdf94f (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/ci/charts.rb')
-rw-r--r-- | lib/gitlab/ci/charts.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/gitlab/ci/charts.rb b/lib/gitlab/ci/charts.rb index 797193a6be5..25fb9c0ca97 100644 --- a/lib/gitlab/ci/charts.rb +++ b/lib/gitlab/ci/charts.rb @@ -31,10 +31,9 @@ module Gitlab current = @from while current <= @to - label = current.strftime(@format) - @labels << label - @total << (totals_count[label] || 0) - @success << (success_count[label] || 0) + @labels << current.strftime(@format) + @total << (totals_count[current] || 0) + @success << (success_count[current] || 0) current += interval_step end @@ -46,7 +45,6 @@ module Gitlab query .group("date_trunc('#{interval}', #{::Ci::Pipeline.table_name}.created_at)") .count(:created_at) - .transform_keys { |date| date.strftime(@format) } end # rubocop: enable CodeReuse/ActiveRecord |