summaryrefslogtreecommitdiff
path: root/config/initializers/sidekiq.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-19 09:08:59 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-19 09:08:59 +0000
commitc1fc5da123a1fe670e32740669a9d5e59eff38f5 (patch)
tree9e872d4057232aed3e5e0304cdfa04db74ba8464 /config/initializers/sidekiq.rb
parent82a708b9f0adca259062555d16a9720f9955993b (diff)
downloadgitlab-ce-c1fc5da123a1fe670e32740669a9d5e59eff38f5.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers/sidekiq.rb')
-rw-r--r--config/initializers/sidekiq.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index b90a04a19e1..22536b60ca1 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
require 'sidekiq/web'
def enable_reliable_fetch?
@@ -71,6 +73,8 @@ Sidekiq.configure_server do |config|
Sidekiq::ReliableFetch.setup_reliable_fetch!(config)
end
+ Gitlab.config.load_dynamic_cron_schedules!
+
# Sidekiq-cron: load recurring jobs from gitlab.yml
# UGLY Hack to get nested hash from settingslogic
cron_jobs = JSON.parse(Gitlab.config.cron_jobs.to_json)