summaryrefslogtreecommitdiff
path: root/config/initializers/1_settings.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-07-19 10:48:17 +0000
committerRémy Coutable <remy@rymai.me>2018-07-19 10:48:17 +0000
commit517f33705d78c4c329fe106707967df2e05220c5 (patch)
tree672fcd6f5f4f162908048a6c9e0946ee505e2e30 /config/initializers/1_settings.rb
parentae55ffe084f955ffde3ac05b0e650e07e67188ab (diff)
parentc62fce988308e545488cbb32569f022e771aa799 (diff)
downloadgitlab-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/initializers/1_settings.rb')
-rw-r--r--config/initializers/1_settings.rb4
1 files changed, 0 insertions, 4 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'