diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-10-04 16:35:05 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-10-04 16:35:05 +0900 |
| commit | f84db3cc917b595752389745eed9da70adee42b2 (patch) | |
| tree | 7e05baefc2df32f6ef324cae755de6294c89c92f /app/workers | |
| parent | 10b09db46ddfdc6dfab55fa9671e716cd46a565b (diff) | |
| download | gitlab-ce-f84db3cc917b595752389745eed9da70adee42b2.tar.gz | |
Revert "Avoid conflicts between enumlator's schedule! method and state machine's schedule! method"
This reverts commit 10b09db46ddfdc6dfab55fa9671e716cd46a565b.
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/pipeline_schedule_worker.rb | 2 | ||||
| -rw-r--r-- | app/workers/run_pipeline_schedule_worker.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/workers/pipeline_schedule_worker.rb b/app/workers/pipeline_schedule_worker.rb index 412df94d238..85d1ffe0fa9 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(:source_schedule, ignore_skip_ci: true, save_on_errors: false, schedule: schedule) + .execute(: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 626c3e23f73..f72331c003a 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(:source_schedule, ignore_skip_ci: true, save_on_errors: false, schedule: schedule) + .execute(:schedule, ignore_skip_ci: true, save_on_errors: false, schedule: schedule) end end |