diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-24 18:11:29 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-24 18:11:29 +0300 |
| commit | cb9b55e662d4164d913ef7031adc135d3ea4d9f0 (patch) | |
| tree | 0da3d639eb5f981cc73f3c72648351e56fedd971 /lib/gitlab/patch | |
| parent | d5f67e75b6ef8ebc1b304589005ccd91ea6674ff (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/patch')
| -rw-r--r-- | lib/gitlab/patch/sidekiq_cron_poller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/patch/sidekiq_cron_poller.rb b/lib/gitlab/patch/sidekiq_cron_poller.rb index 87d6c8f324e..1c24707499e 100644 --- a/lib/gitlab/patch/sidekiq_cron_poller.rb +++ b/lib/gitlab/patch/sidekiq_cron_poller.rb @@ -21,7 +21,7 @@ module Gitlab # Note: This diverges from the Sidekiq implementation in 6.4.2 to address a bug where the poll interval wouldn't # scale properly when the process count changes, and to take into account the `cron_poll_interval` setting. See # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99030#note_1117078517 for more details - Sidekiq.options[:cron_poll_interval] || Sidekiq.options[:poll_interval_average] || scaled_poll_interval + Gitlab.config.cron_jobs.poll_interval || Sidekiq.options[:poll_interval_average] || scaled_poll_interval end end end |