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
6be65320
Commit
6be65320
authored
Sep 12, 2019
by
Cédric Tabin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes non interruptible scope name
parent
80e9f7f3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+1
-1
app/services/ci/create_pipeline_service.rb
app/services/ci/create_pipeline_service.rb
+1
-1
No files found.
app/models/ci/pipeline.rb
View file @
6be65320
...
@@ -231,7 +231,7 @@ module Ci
...
@@ -231,7 +231,7 @@ module Ci
where
(
'EXISTS (?)'
,
::
Ci
::
Build
.
latest
.
with_reports
(
reports_scope
).
where
(
'ci_pipelines.id=ci_builds.commit_id'
).
select
(
1
))
where
(
'EXISTS (?)'
,
::
Ci
::
Build
.
latest
.
with_reports
(
reports_scope
).
where
(
'ci_pipelines.id=ci_builds.commit_id'
).
select
(
1
))
end
end
scope
:with
out
_interruptible_builds
,
->
do
scope
:with
_only
_interruptible_builds
,
->
do
where
(
'NOT EXISTS (?)'
,
where
(
'NOT EXISTS (?)'
,
Ci
::
Build
.
where
(
'ci_builds.commit_id = ci_pipelines.id'
)
Ci
::
Build
.
where
(
'ci_builds.commit_id = ci_pipelines.id'
)
.
with_status
(
:running
,
:success
,
:failed
)
.
with_status
(
:running
,
:success
,
:failed
)
...
...
app/services/ci/create_pipeline_service.rb
View file @
6be65320
...
@@ -101,7 +101,7 @@ module Ci
...
@@ -101,7 +101,7 @@ module Ci
.
where
.
not
(
id:
pipeline
.
id
)
.
where
.
not
(
id:
pipeline
.
id
)
.
where
.
not
(
sha:
project
.
commit
(
pipeline
.
ref
).
try
(
:id
))
.
where
.
not
(
sha:
project
.
commit
(
pipeline
.
ref
).
try
(
:id
))
.
alive_or_scheduled
.
alive_or_scheduled
.
with
out
_interruptible_builds
.
with
_only
_interruptible_builds
else
else
project
.
ci_pipelines
project
.
ci_pipelines
.
where
(
ref:
pipeline
.
ref
)
.
where
(
ref:
pipeline
.
ref
)
...
...
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