diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-08-08 04:47:48 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-08-08 04:47:48 +0300 |
| commit | fd40bce9ccad94c3f8fe522a51a771335d95539f (patch) | |
| tree | 0fb76c147480326f17fb77271628c24794255572 /config | |
| parent | 4490af8cf22416f12c8cf2e00f8b7c293be08167 (diff) | |
| parent | a0c22d1edafbd87d59dbf01acd610da97ec87912 (diff) | |
Merge branch '31207-clean-locked-merge-requests' into 'master'
Resolve "Store MergeWorker JID on merge request, and clean up stuck merges"
Closes #31207
See merge request !13207
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/1_settings.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index e24cf33adb5..2699173fc61 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -395,6 +395,10 @@ 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' +Settings.cron_jobs['stuck_merge_jobs_worker'] ||= Settingslogic.new({}) +Settings.cron_jobs['stuck_merge_jobs_worker']['cron'] ||= '0 */2 * * *' +Settings.cron_jobs['stuck_merge_jobs_worker']['job_class'] = 'StuckMergeJobsWorker' + # # GitLab Shell # |