summaryrefslogtreecommitdiff
path: root/config/initializers/1_settings.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-07 21:07:54 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-07 21:07:54 +0000
commit8c8b94e7116fa478ad490bd14c09565d23097f57 (patch)
tree9e4637aa0fe498a5523c86932b87ff691ec72af6 /config/initializers/1_settings.rb
parenteadb77d89f5f7d445bfd326f18873168f4719f12 (diff)
downloadgitlab-ce-8c8b94e7116fa478ad490bd14c09565d23097f57.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers/1_settings.rb')
-rw-r--r--config/initializers/1_settings.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 6feeab6ab6b..4e66aff8c17 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -491,6 +491,9 @@ Gitlab.ee do
Settings.cron_jobs['historical_data_worker'] ||= Settingslogic.new({})
Settings.cron_jobs['historical_data_worker']['cron'] ||= '0 12 * * *'
Settings.cron_jobs['historical_data_worker']['job_class'] = 'HistoricalDataWorker'
+ Settings.cron_jobs['import_software_licenses_worker'] ||= Settingslogic.new({})
+ Settings.cron_jobs['import_software_licenses_worker']['cron'] ||= '0 3 * * 0'
+ Settings.cron_jobs['import_software_licenses_worker']['job_class'] = 'ImportSoftwareLicensesWorker'
Settings.cron_jobs['ldap_group_sync_worker'] ||= Settingslogic.new({})
Settings.cron_jobs['ldap_group_sync_worker']['cron'] ||= '0 * * * *'
Settings.cron_jobs['ldap_group_sync_worker']['job_class'] = 'LdapAllGroupsSyncWorker'