diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2017-05-07 22:35:56 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-07 22:35:56 +0000 |
| commit | 8df3997a92bffa2d29f3c559933a336b837cdb93 (patch) | |
| tree | 5ee50876b35b6c5fd40607665f72468cfcee51fe /config | |
| parent | 8a0cde81feb3c8f3af26eefa5cef7b72eda2d266 (diff) | |
| download | gitlab-ce-8df3997a92bffa2d29f3c559933a336b837cdb93.tar.gz | |
Add Pipeline Schedules that supersedes experimental Trigger Schedule
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 2 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 6 | ||||
| -rw-r--r-- | config/routes/project.rb | 6 | ||||
| -rw-r--r-- | config/webpack.config.js | 2 |
4 files changed, 12 insertions, 4 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index fa503f84dd0..14d99c243fc 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 - trigger_schedule_worker: + pipeline_schedule_worker: cron: "0 */12 * * *" # Remove expired build artifacts expire_build_artifacts_worker: diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 6a6fbe86df9..6097ae6534e 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -323,9 +323,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['trigger_schedule_worker'] ||= Settingslogic.new({}) -Settings.cron_jobs['trigger_schedule_worker']['cron'] ||= '0 */12 * * *' -Settings.cron_jobs['trigger_schedule_worker']['job_class'] = 'TriggerScheduleWorker' +Settings.cron_jobs['pipeline_schedule_worker'] ||= Settingslogic.new({}) +Settings.cron_jobs['pipeline_schedule_worker']['cron'] ||= '0 */12 * * *' +Settings.cron_jobs['pipeline_schedule_worker']['job_class'] = 'PipelineScheduleWorker' 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' diff --git a/config/routes/project.rb b/config/routes/project.rb index 68474a44368..7f6e5447b19 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -128,6 +128,12 @@ constraints(ProjectUrlConstrainer.new) do end end + resources :pipeline_schedules, except: [:show] do + member do + post :take_ownership + end + end + resources :environments, except: [:destroy] do member do post :stop diff --git a/config/webpack.config.js b/config/webpack.config.js index a3dae6b2e13..cb6bd949ddb 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -54,6 +54,8 @@ var config = { protected_branches: './protected_branches/protected_branches_bundle.js', protected_tags: './protected_tags', sidebar: './sidebar/sidebar_bundle.js', + schedule_form: './pipeline_schedules/pipeline_schedule_form_bundle.js', + schedules_index: './pipeline_schedules/pipeline_schedules_index_bundle.js', snippet: './snippet/snippet_bundle.js', sketch_viewer: './blob/sketch_viewer.js', stl_viewer: './blob/stl_viewer.js', |