diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2019-06-06 22:12:23 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2019-06-06 22:12:23 +0800 |
| commit | 5826ac99d94af8b4ec76aa12557bb9917a12cdf1 (patch) | |
| tree | d8d99a9b63ba6883fd4e13f8f006a0276ecf59b1 | |
| parent | e5aba4b153d4ebaa8a6b0683f7ecae706e9c7e45 (diff) | |
| download | gitlab-ce-62760-use-time-zone-now.tar.gz | |
The test was using Time.zone.now so match it62760-use-time-zone-now
| -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 |