diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-07-19 10:48:17 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-07-19 10:48:17 +0000 |
| commit | 517f33705d78c4c329fe106707967df2e05220c5 (patch) | |
| tree | 672fcd6f5f4f162908048a6c9e0946ee505e2e30 /config | |
| parent | ae55ffe084f955ffde3ac05b0e650e07e67188ab (diff) | |
| parent | c62fce988308e545488cbb32569f022e771aa799 (diff) | |
| download | gitlab-ce-517f33705d78c4c329fe106707967df2e05220c5.tar.gz | |
Merge branch '43312-remove_user_activity_workers' into 'master'
Delete UserActivities and related workers
Closes #43312
See merge request gitlab-org/gitlab-ce!20597
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/1_settings.rb | 4 | ||||
| -rw-r--r-- | config/sidekiq_queues.yml | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 44bc72a7185..c3122827a6b 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -319,10 +319,6 @@ 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']['job_class'] = 'GitlabUsagePingWorker' -Settings.cron_jobs['schedule_update_user_activity_worker'] ||= Settingslogic.new({}) -Settings.cron_jobs['schedule_update_user_activity_worker']['cron'] ||= '30 0 * * *' -Settings.cron_jobs['schedule_update_user_activity_worker']['job_class'] = 'ScheduleUpdateUserActivityWorker' - Settings.cron_jobs['remove_old_web_hook_logs_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['remove_old_web_hook_logs_worker']['cron'] ||= '40 0 * * *' Settings.cron_jobs['remove_old_web_hook_logs_worker']['job_class'] = 'RemoveOldWebHookLogsWorker' diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index 3400142db36..70b584ff9e9 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -62,7 +62,6 @@ - [default, 1] - [pages, 1] - [system_hook_push, 1] - - [update_user_activity, 1] - [propagate_service_template, 1] - [background_migration, 1] - [gcp_cluster, 1] @@ -77,4 +76,3 @@ - [repository_remove_remote, 1] - [create_note_diff_file, 1] - [delete_diff_files, 1] - |