diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index 4aaabed6b7b..29317cd530d 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -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) diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb index 4a7f62de9e1..d34cafce563 100644 --- a/app/services/ci/create_pipeline_service.rb +++ b/app/services/ci/create_pipeline_service.rb @@ -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)