1 files changed, 9 insertions, 1 deletions
diff --git a/lib/gitlab/ci/pipeline/chain/cancel_pending_pipelines.rb b/lib/gitlab/ci/pipeline/chain/cancel_pending_pipelines.rb
index 468f3bc4689..a864c843dd8 100644
--- a/lib/gitlab/ci/pipeline/chain/cancel_pending_pipelines.rb
+++ b/lib/gitlab/ci/pipeline/chain/cancel_pending_pipelines.rb
@@ -25,7 +25,7 @@ module Gitlab
 
           # rubocop: disable CodeReuse/ActiveRecord
           def auto_cancelable_pipelines
-            project.ci_pipelines
+            pipelines
               .where(ref: pipeline.ref)
               .where.not(id: pipeline.same_family_pipeline_ids)
               .where.not(sha: project.commit(pipeline.ref).try(:id))
@@ -33,6 +33,14 @@ module Gitlab
               .with_only_interruptible_builds
           end
           # rubocop: enable CodeReuse/ActiveRecord
+
+          def pipelines
+            if ::Feature.enabled?(:ci_auto_cancel_all_pipelines, project, default_enabled: false)
+              project.all_pipelines.ci_and_parent_sources
+            else
+              project.ci_pipelines
+            end
+          end
         end
       end
     end