diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-07 21:07:54 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-07 21:07:54 +0000 |
| commit | 8c8b94e7116fa478ad490bd14c09565d23097f57 (patch) | |
| tree | 9e4637aa0fe498a5523c86932b87ff691ec72af6 /config | |
| parent | eadb77d89f5f7d445bfd326f18873168f4719f12 (diff) | |
| download | gitlab-ce-8c8b94e7116fa478ad490bd14c09565d23097f57.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/1_settings.rb | 3 | ||||
| -rw-r--r-- | config/routes/admin.rb | 2 |
2 files changed, 4 insertions, 1 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' diff --git a/config/routes/admin.rb b/config/routes/admin.rb index 418d3324569..c6aa51b50ef 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -114,7 +114,7 @@ namespace :admin do put :reset_registration_token put :reset_health_check_token put :clear_repository_check_states - match :general, :integrations, :repository, :templates, :ci_cd, :reporting, :metrics_and_profiling, :network, :geo, :preferences, via: [:get, :patch] + match :general, :integrations, :repository, :ci_cd, :reporting, :metrics_and_profiling, :network, :preferences, via: [:get, :patch] get :lets_encrypt_terms_of_service end |