diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-10-04 15:11:36 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-10-04 15:11:36 +0900 |
| commit | 10b09db46ddfdc6dfab55fa9671e716cd46a565b (patch) | |
| tree | 7726a58c031d7df9d4ab4f16e027f00a9452d18b /app | |
| parent | 5381985bd012562696637122b1dcd067480a94d3 (diff) | |
| download | gitlab-ce-10b09db46ddfdc6dfab55fa9671e716cd46a565b.tar.gz | |
Avoid conflicts between enumlator's schedule! method and state machine's schedule! method
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/ci/pipeline.rb | 2 | ||||
| -rw-r--r-- | app/workers/pipeline_schedule_worker.rb | 2 | ||||
| -rw-r--r-- | app/workers/run_pipeline_schedule_worker.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index b74c65c2627..1e76cbe7c01 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -63,7 +63,7 @@ module Ci push: 1, web: 2, trigger: 3, - schedule: 4, + source_schedule: 4, api: 5, external: 6 } diff --git a/app/workers/pipeline_schedule_worker.rb b/app/workers/pipeline_schedule_worker.rb index 85d1ffe0fa9..412df94d238 100644 --- a/app/workers/pipeline_schedule_worker.rb +++ b/app/workers/pipeline_schedule_worker.rb @@ -12,7 +12,7 @@ class PipelineScheduleWorker pipeline = Ci::CreatePipelineService.new(schedule.project, schedule.owner, ref: schedule.ref) - .execute(:schedule, ignore_skip_ci: true, save_on_errors: false, schedule: schedule) + .execute(:source_schedule, ignore_skip_ci: true, save_on_errors: false, schedule: schedule) schedule.deactivate! unless pipeline.persisted? rescue => e diff --git a/app/workers/run_pipeline_schedule_worker.rb b/app/workers/run_pipeline_schedule_worker.rb index f72331c003a..626c3e23f73 100644 --- a/app/workers/run_pipeline_schedule_worker.rb +++ b/app/workers/run_pipeline_schedule_worker.rb @@ -21,6 +21,6 @@ class RunPipelineScheduleWorker Ci::CreatePipelineService.new(schedule.project, user, ref: schedule.ref) - .execute(:schedule, ignore_skip_ci: true, save_on_errors: false, schedule: schedule) + .execute(:source_schedule, ignore_skip_ci: true, save_on_errors: false, schedule: schedule) end end |