Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
29b9cfb9
Commit
29b9cfb9
authored
Jun 11, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
a37596e1
74850f1f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
1 deletion
+18
-1
app/services/ci/pipeline_schedule_service.rb
app/services/ci/pipeline_schedule_service.rb
+1
-1
changelogs/unreleased/fix-pipeline-schedule-owner-is-nil.yml
changelogs/unreleased/fix-pipeline-schedule-owner-is-nil.yml
+5
-0
doc/development/architecture.md
doc/development/architecture.md
+4
-0
spec/services/ci/pipeline_schedule_service_spec.rb
spec/services/ci/pipeline_schedule_service_spec.rb
+8
-0
No files found.
app/services/ci/pipeline_schedule_service.rb
View file @
29b9cfb9
...
@@ -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
changelogs/unreleased/fix-pipeline-schedule-owner-is-nil.yml
0 → 100644
View file @
29b9cfb9
---
title
:
Fix pipeline schedules when owner is nil
merge_request
:
author
:
type
:
fixed
doc/development/architecture.md
View file @
29b9cfb9
---
table_display_block
:
true
---
# GitLab Architecture Overview
# GitLab Architecture Overview
## Software delivery
## Software delivery
...
...
spec/services/ci/pipeline_schedule_service_spec.rb
View file @
29b9cfb9
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment