Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDosuken shinya <gitlab.shinyamaeda@gmail.com>2017-05-10 18:48:09 +0300
committerRémy Coutable <remy@rymai.me>2017-05-10 18:48:09 +0300
commit11759374698eb172c05e6a701d4ff7dc5f9d8251 (patch)
tree68707ee7f05bbe323146db9216f75c52e448e61f /lib/gitlab/ci
parent8d58e10385f128084a4187effa07cd4d3535dcbc (diff)
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')
-rw-r--r--lib/gitlab/ci/cron_parser.rb2
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?