summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorShinya Maeda <gitlab.shinyamaeda@gmail.com>2017-03-29 20:49:47 +0900
committerShinya Maeda <gitlab.shinyamaeda@gmail.com>2017-04-06 23:46:58 +0900
commitc426763c42d41c9c0c9a9cfe544f3185eeaa984f (patch)
treee930de34c126d3780e70dcf1bfc4a4d23cbfd6ef /config
parente32c1a5c92a80c350bbf3b70552be5cf29501fe7 (diff)
downloadgitlab-ce-c426763c42d41c9c0c9a9cfe544f3185eeaa984f.tar.gz
Rename ScheduledTrigger to TriggerSchedule. Because table structure changed.
Diffstat (limited to 'config')
-rw-r--r--config/gitlab.yml.example2
-rw-r--r--config/initializers/1_settings.rb6
2 files changed, 4 insertions, 4 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 892064949ce..6fb67426c8b 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -181,7 +181,7 @@ production: &base
stuck_ci_jobs_worker:
cron: "0 * * * *"
# Execute scheduled triggers
- scheduled_trigger_worker:
+ trigger_schedule_worker:
cron: "0 * * * *"
# Remove expired build artifacts
expire_build_artifacts_worker:
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 15e6b382eb7..71342f435f1 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -315,9 +315,9 @@ Settings['cron_jobs'] ||= Settingslogic.new({})
Settings.cron_jobs['stuck_ci_jobs_worker'] ||= Settingslogic.new({})
Settings.cron_jobs['stuck_ci_jobs_worker']['cron'] ||= '0 * * * *'
Settings.cron_jobs['stuck_ci_jobs_worker']['job_class'] = 'StuckCiJobsWorker'
-Settings.cron_jobs['scheduled_trigger_worker'] ||= Settingslogic.new({})
-Settings.cron_jobs['scheduled_trigger_worker']['cron'] ||= '0 * * * *'
-Settings.cron_jobs['scheduled_trigger_worker']['job_class'] = 'ScheduledTriggerWorker'
+Settings.cron_jobs['trigger_schedule_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['trigger_schedule_worker']['cron'] ||= '0 * * * *'
+Settings.cron_jobs['trigger_schedule_worker']['job_class'] = 'TriggerScheduleWorker'
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'