summaryrefslogtreecommitdiff
path: root/config/initializers/1_settings.rb
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-06-16 15:01:27 +0200
committerJames Lopez <james@jameslopez.es>2016-06-16 15:01:27 +0200
commitb3a0a1c3155702e2deddade0fea3e79087b40da4 (patch)
tree096bf8b46f1d9dc4be16cf29551a27d8fd6c8d7b /config/initializers/1_settings.rb
parent8ac52f49c024775311a0736ddad964e85c8f6ed2 (diff)
parent2a747d386dbdc05453fce6b8be3f483e8cd9e796 (diff)
downloadgitlab-ce-b3a0a1c3155702e2deddade0fea3e79087b40da4.tar.gz
fixed merge conflicts on UI branch
Diffstat (limited to 'config/initializers/1_settings.rb')
-rw-r--r--config/initializers/1_settings.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 7a9aa632fcf..09ffc319065 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -279,6 +279,9 @@ Settings['cron_jobs'] ||= Settingslogic.new({})
Settings.cron_jobs['stuck_ci_builds_worker'] ||= Settingslogic.new({})
Settings.cron_jobs['stuck_ci_builds_worker']['cron'] ||= '0 0 * * *'
Settings.cron_jobs['stuck_ci_builds_worker']['job_class'] = 'StuckCiBuildsWorker'
+Settings.cron_jobs['expire_build_artifacts_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['expire_build_artifacts_worker']['cron'] ||= '50 * * * *'
+Settings.cron_jobs['expire_build_artifacts_worker']['job_class'] = 'ExpireBuildArtifactsWorker'
Settings.cron_jobs['repository_check_worker'] ||= Settingslogic.new({})
Settings.cron_jobs['repository_check_worker']['cron'] ||= '20 * * * *'
Settings.cron_jobs['repository_check_worker']['job_class'] = 'RepositoryCheck::BatchWorker'