diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-16 15:06:26 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-16 15:06:26 +0300 |
| commit | d2798d607e11e0ebae83ae909404834388733428 (patch) | |
| tree | 096b7f4d4bdb315d28cdcd4d6db4e80911112e9c /app/services/ci/create_pipeline_service.rb | |
| parent | d8211a0ed119eada7d292e974a8fc7b0cd982d3c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/ci/create_pipeline_service.rb')
| -rw-r--r-- | app/services/ci/create_pipeline_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb index 539576147f3..3278a87c576 100644 --- a/app/services/ci/create_pipeline_service.rb +++ b/app/services/ci/create_pipeline_service.rb @@ -95,7 +95,7 @@ module Ci # rubocop: disable CodeReuse/ActiveRecord def auto_cancelable_pipelines # TODO: Introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23464 - if Feature.enabled?(:ci_support_interruptible_pipelines, project, default_enabled: true) + if Feature.enabled?(:ci_support_interruptible_pipelines, project, default_enabled: false) project.ci_pipelines .where(ref: pipeline.ref) .where.not(id: pipeline.id) |