diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-10-22 08:59:16 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-10-22 08:59:16 +0000 |
| commit | fdcdc36eecdbe904cf80fa130aebf4edd34c3f12 (patch) | |
| tree | 3f1e1e8ca07448d4e5ac22b53e359be4a907bea4 /lib | |
| parent | b5dfa745800a38cc17cadc0aa49a933713bdc1a5 (diff) | |
| parent | fb685031d8c60ca1d8f607c569cd519875e873c9 (diff) | |
| download | gitlab-ce-fdcdc36eecdbe904cf80fa130aebf4edd34c3f12.tar.gz | |
Merge branch 'drop-allow_overflow-option-duration_in_numbers' into 'master'
Drop allow overflow option duration in numbers
Closes #52284
See merge request gitlab-org/gitlab-ce!22246
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ci/status/build/scheduled.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ci/status/build/scheduled.rb b/lib/gitlab/ci/status/build/scheduled.rb index 6f460b62fa9..62ad9083616 100644 --- a/lib/gitlab/ci/status/build/scheduled.rb +++ b/lib/gitlab/ci/status/build/scheduled.rb @@ -29,7 +29,7 @@ module Gitlab def execute_in remaining_seconds = [0, subject.scheduled_at - Time.now].max - duration_in_numbers(remaining_seconds, true) + duration_in_numbers(remaining_seconds) end end end |