diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-03-07 08:17:35 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-03-07 08:17:35 +0000 |
| commit | 95016507d49c3099afde0ef3909377bf70061dc3 (patch) | |
| tree | c4a07f08e40711db24d54b55f357d6128f051578 /lib | |
| parent | 0649a1f8359930b84d7295272b1f8e32c32c0d2c (diff) | |
| parent | 44177cea3811b450ae65a9dbeb51dac9d0ef5253 (diff) | |
| download | gitlab-ce-95016507d49c3099afde0ef3909377bf70061dc3.tar.gz | |
Merge branch 'master' into 'master'
CI charts now include the current day
Closes #42921
See merge request gitlab-org/gitlab-ce!17032
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ci/charts.rb | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lib/gitlab/ci/charts.rb b/lib/gitlab/ci/charts.rb index 525563a97f5..46ed330dbbf 100644 --- a/lib/gitlab/ci/charts.rb +++ b/lib/gitlab/ci/charts.rb @@ -68,10 +68,11 @@ module Gitlab class YearChart < Chart include MonthlyInterval + attr_reader :to, :from def initialize(*) - @to = Date.today.end_of_month - @from = @to.years_ago(1).beginning_of_month + @to = Date.today.end_of_month.end_of_day + @from = @to.years_ago(1).beginning_of_month.beginning_of_day @format = '%d %B %Y' super @@ -80,10 +81,11 @@ module Gitlab class MonthChart < Chart include DailyInterval + attr_reader :to, :from def initialize(*) - @to = Date.today - @from = @to - 30.days + @to = Date.today.end_of_day + @from = 1.month.ago.beginning_of_day @format = '%d %B' super @@ -92,10 +94,11 @@ module Gitlab class WeekChart < Chart include DailyInterval + attr_reader :to, :from def initialize(*) - @to = Date.today - @from = @to - 7.days + @to = Date.today.end_of_day + @from = 1.week.ago.beginning_of_day @format = '%d %B' super |