diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-29 18:08:36 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-29 18:08:36 +0300 |
| commit | 5b9b518d9f152eb5b88ef58512355fe2dbc8c032 (patch) | |
| tree | e932397afdf40ab3175c22a327d3acd223f8d367 /config | |
| parent | c3fe9f52152cd57f6790d30efc2d5e4b9dbf54dd (diff) | |
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/sidekiq_queues.yml | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index f7d3b12d7e9..ff034460120 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -702,9 +702,6 @@ Gitlab.ee do Settings.cron_jobs['adjourned_group_deletion_worker'] ||= {} Settings.cron_jobs['adjourned_group_deletion_worker']['cron'] ||= '0 2 * * *' Settings.cron_jobs['adjourned_group_deletion_worker']['job_class'] = 'AdjournedGroupDeletionWorker' - Settings.cron_jobs['clear_shared_runners_minutes_worker'] ||= {} - Settings.cron_jobs['clear_shared_runners_minutes_worker']['cron'] ||= '0 0 1 * *' - Settings.cron_jobs['clear_shared_runners_minutes_worker']['job_class'] = 'ClearSharedRunnersMinutesWorker' Settings.cron_jobs['adjourned_projects_deletion_cron_worker'] ||= {} Settings.cron_jobs['adjourned_projects_deletion_cron_worker']['cron'] ||= '0 7 * * *' Settings.cron_jobs['adjourned_projects_deletion_cron_worker']['job_class'] = 'AdjournedProjectsDeletionCronWorker' diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index 0e10fe312e9..970df2d4465 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -113,8 +113,6 @@ - 2 - - chat_notification - 2 -- - ci_batch_reset_minutes - - 1 - - ci_cancel_pipeline - 1 - - ci_cancel_redundant_pipelines |