kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fixes non interruptible scope name

Browse source
This commit is contained in:
Cédric Tabin 2019-09-12 00:09:42 +02:00
parent 80e9f7f346
commit 6be653208a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/ci/pipeline.rb
View file

@ -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))
end
scope :without_interruptible_builds, -> do
scope :with_only_interruptible_builds, -> do
where('NOT EXISTS (?)',
Ci::Build.where('ci_builds.commit_id = ci_pipelines.id')
.with_status(:running, :success, :failed)

2
app/services/ci/create_pipeline_service.rb
View file

@ -101,7 +101,7 @@ module Ci
.where.not(id: pipeline.id)
.where.not(sha: project.commit(pipeline.ref).try(:id))
.alive_or_scheduled
.without_interruptible_builds
.with_only_interruptible_builds
else
project.ci_pipelines
.where(ref: pipeline.ref)