From c1fc5da123a1fe670e32740669a9d5e59eff38f5 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 19 Feb 2020 09:08:59 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- config/initializers/1_settings.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/initializers/1_settings.rb') diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index aa743416e99..5f07b486aea 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -446,7 +446,7 @@ Settings.cron_jobs['stuck_import_jobs_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['stuck_import_jobs_worker']['cron'] ||= '15 * * * *' Settings.cron_jobs['stuck_import_jobs_worker']['job_class'] = 'StuckImportJobsWorker' Settings.cron_jobs['gitlab_usage_ping_worker'] ||= Settingslogic.new({}) -Settings.cron_jobs['gitlab_usage_ping_worker']['cron'] ||= Settings.__send__(:cron_for_usage_ping) +Settings.cron_jobs['gitlab_usage_ping_worker']['cron'] ||= nil # This is dynamically loaded in the sidekiq initializer Settings.cron_jobs['gitlab_usage_ping_worker']['job_class'] = 'GitlabUsagePingWorker' Settings.cron_jobs['stuck_merge_jobs_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['stuck_merge_jobs_worker']['cron'] ||= '0 */2 * * *' -- cgit v1.2.3