diff options
author | Stan Hu <stanhu@gmail.com> | 2019-06-11 16:06:07 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-06-11 16:06:07 +0000 |
commit | 74850f1f8e17d3e1e6ee21a1d1daadc6ceeeb2b4 (patch) | |
tree | 9913081dce2895a7f04824f7a6ea8ddfde2508d3 | |
parent | 30d3fca3483c55a88c2d76d63b66b2090babd899 (diff) | |
parent | 7ac5dfc1e9ef4d4e3eb3ae04f6349cfe48a22e8d (diff) | |
download | gitlab-ce-74850f1f8e17d3e1e6ee21a1d1daadc6ceeeb2b4.tar.gz |
Merge branch 'fix-pipeline-schedule-owner-is-nil' into 'master'
Fix pipeline schedule when owner is nil
Closes gitlab-com/gl-infra/production#805 and #63086
See merge request gitlab-org/gitlab-ce!29477
-rw-r--r-- | app/services/ci/pipeline_schedule_service.rb | 2 | ||||
-rw-r--r-- | changelogs/unreleased/fix-pipeline-schedule-owner-is-nil.yml | 5 | ||||
-rw-r--r-- | spec/services/ci/pipeline_schedule_service_spec.rb | 8 |
3 files changed, 14 insertions, 1 deletions
diff --git a/app/services/ci/pipeline_schedule_service.rb b/app/services/ci/pipeline_schedule_service.rb index 387d0351490..5b5e9a26520 100644 --- a/app/services/ci/pipeline_schedule_service.rb +++ b/app/services/ci/pipeline_schedule_service.rb @@ -7,7 +7,7 @@ module Ci # Otherwise, multiple pipelines could be created in a short interval. schedule.schedule_next_run! - RunPipelineScheduleWorker.perform_async(schedule.id, schedule.owner.id) + RunPipelineScheduleWorker.perform_async(schedule.id, schedule.owner&.id) end end end diff --git a/changelogs/unreleased/fix-pipeline-schedule-owner-is-nil.yml b/changelogs/unreleased/fix-pipeline-schedule-owner-is-nil.yml new file mode 100644 index 00000000000..5c8644d2860 --- /dev/null +++ b/changelogs/unreleased/fix-pipeline-schedule-owner-is-nil.yml @@ -0,0 +1,5 @@ +--- +title: Fix pipeline schedules when owner is nil +merge_request: +author: +type: fixed diff --git a/spec/services/ci/pipeline_schedule_service_spec.rb b/spec/services/ci/pipeline_schedule_service_spec.rb index f2ac53cb25a..867ed0acc0d 100644 --- a/spec/services/ci/pipeline_schedule_service_spec.rb +++ b/spec/services/ci/pipeline_schedule_service_spec.rb @@ -24,5 +24,13 @@ describe Ci::PipelineScheduleService do subject end + + context 'when owner is nil' do + let(:schedule) { create(:ci_pipeline_schedule, project: project, owner: nil) } + + it 'does not raise an error' do + expect { subject }.not_to raise_error + end + end end end |