diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-01 12:07:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-01 12:07:42 +0300 |
| commit | 9c1fa86a6aa0268eae2fafc7d90908502942b810 (patch) | |
| tree | 511e517bba91df4c60313960ec149835efb78779 /config | |
| parent | b2152c3f869fda3e77874e3ce1c8e1bd489cc9ec (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 5 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 20c75a6e255..330e5109ed4 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -454,6 +454,11 @@ production: &base pseudonymizer_worker: cron: "0 * * * *" + # Elasticsearch bulk updater for incremental updates. + # NOTE: This will only take effect if elasticsearch is enabled. + elastic_index_bulk_cron_worker: + cron: "*/1 * * * *" + registry: # enabled: true # host: registry.example.com diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 156cf78dfc4..684ccb73603 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -537,6 +537,9 @@ Gitlab.ee do Settings.cron_jobs['update_max_seats_used_for_gitlab_com_subscriptions_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['update_max_seats_used_for_gitlab_com_subscriptions_worker']['cron'] ||= '0 12 * * *' Settings.cron_jobs['update_max_seats_used_for_gitlab_com_subscriptions_worker']['job_class'] = 'UpdateMaxSeatsUsedForGitlabComSubscriptionsWorker' + Settings.cron_jobs['elastic_index_bulk_cron_worker'] ||= Settingslogic.new({}) + Settings.cron_jobs['elastic_index_bulk_cron_worker']['cron'] ||= '*/1 * * * *' + Settings.cron_jobs['elastic_index_bulk_cron_worker']['job_class'] ||= 'ElasticIndexBulkCronWorker' end # |