diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-06-11 16:09:39 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-06-11 16:09:39 +0000 |
| commit | 8863e0c7493015c944f5c290716b5250e3cbaa3f (patch) | |
| tree | 97ef09cb6159fecf8344bd4b327b2cecd820762c | |
| parent | d6446335dafb71cc43bf3a04300729d5ad563adf (diff) | |
| parent | f8abc06ee5699daca80db7b5c74927f28416e655 (diff) | |
| download | gitlab-ce-8863e0c7493015c944f5c290716b5250e3cbaa3f.tar.gz | |
Merge branch '62760-use-time-zone-now' into 'master'
Use Time.zone.now for Ci::PipelineSchedule#ideal_next_run_at
Closes #62760
See merge request gitlab-org/gitlab-ce!29275
| -rw-r--r-- | app/models/ci/pipeline_schedule.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/ci/pipeline_schedule.rb b/app/models/ci/pipeline_schedule.rb index c40ad39be61..6a4241c94bc 100644 --- a/app/models/ci/pipeline_schedule.rb +++ b/app/models/ci/pipeline_schedule.rb @@ -73,7 +73,8 @@ module Ci private def ideal_next_run_at - Gitlab::Ci::CronParser.new(cron, cron_timezone).next_time_from(Time.now) + Gitlab::Ci::CronParser.new(cron, cron_timezone) + .next_time_from(Time.zone.now) end end end |