diff options
| author | Dosuken shinya <gitlab.shinyamaeda@gmail.com> | 2017-05-10 15:48:09 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-05-10 15:48:09 +0000 |
| commit | 11759374698eb172c05e6a701d4ff7dc5f9d8251 (patch) | |
| tree | 68707ee7f05bbe323146db9216f75c52e448e61f /lib/gitlab/ci/cron_parser.rb | |
| parent | 8d58e10385f128084a4187effa07cd4d3535dcbc (diff) | |
| download | gitlab-ce-11759374698eb172c05e6a701d4ff7dc5f9d8251.tar.gz | |
Resolve "Update gem sidekiq-cron from 0.4.4 to 0.6.0 and rufus-scheduler from 3.1.10 to 3.4.0"
Diffstat (limited to 'lib/gitlab/ci/cron_parser.rb')
| -rw-r--r-- | lib/gitlab/ci/cron_parser.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ci/cron_parser.rb b/lib/gitlab/ci/cron_parser.rb index dad8c3cdf5b..551483d0aaa 100644 --- a/lib/gitlab/ci/cron_parser.rb +++ b/lib/gitlab/ci/cron_parser.rb @@ -11,7 +11,7 @@ module Gitlab def next_time_from(time) @cron_line ||= try_parse_cron(@cron, @cron_timezone) - @cron_line.next_time(time).in_time_zone(Time.zone) if @cron_line.present? + @cron_line.next_time(time).utc.in_time_zone(Time.zone) if @cron_line.present? end def cron_valid? |