Commit 29b9cfb9 authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents a37596e1 74850f1f
...@@ -7,7 +7,7 @@ module Ci ...@@ -7,7 +7,7 @@ module Ci
# Otherwise, multiple pipelines could be created in a short interval. # Otherwise, multiple pipelines could be created in a short interval.
schedule.schedule_next_run! schedule.schedule_next_run!
RunPipelineScheduleWorker.perform_async(schedule.id, schedule.owner.id) RunPipelineScheduleWorker.perform_async(schedule.id, schedule.owner&.id)
end end
end end
end end
---
title: Fix pipeline schedules when owner is nil
merge_request:
author:
type: fixed
---
table_display_block: true
---
# GitLab Architecture Overview # GitLab Architecture Overview
## Software delivery ## Software delivery
......
...@@ -24,5 +24,13 @@ describe Ci::PipelineScheduleService do ...@@ -24,5 +24,13 @@ describe Ci::PipelineScheduleService do
subject subject
end 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
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment