Commit 8863e0c7 authored by Rémy Coutable's avatar Rémy Coutable

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
parents d6446335 f8abc06e
...@@ -73,7 +73,8 @@ module Ci ...@@ -73,7 +73,8 @@ module Ci
private private
def ideal_next_run_at 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 end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment