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
cab0ccb9
Commit
cab0ccb9
authored
Sep 14, 2019
by
Cédric Tabin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disable interruptible pipeline feature flag by default
parent
214441d1
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
app/services/ci/create_pipeline_service.rb
app/services/ci/create_pipeline_service.rb
+1
-1
spec/services/ci/create_pipeline_service_spec.rb
spec/services/ci/create_pipeline_service_spec.rb
+5
-0
No files found.
app/services/ci/create_pipeline_service.rb
View file @
cab0ccb9
...
@@ -95,7 +95,7 @@ module Ci
...
@@ -95,7 +95,7 @@ module Ci
# rubocop: disable CodeReuse/ActiveRecord
# rubocop: disable CodeReuse/ActiveRecord
def
auto_cancelable_pipelines
def
auto_cancelable_pipelines
# TODO: Introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23464
# TODO: Introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23464
if
Feature
.
enabled?
(
:ci_support_interruptible_pipelines
,
project
,
default_enabled:
tru
e
)
if
Feature
.
enabled?
(
:ci_support_interruptible_pipelines
,
project
,
default_enabled:
fals
e
)
project
.
ci_pipelines
project
.
ci_pipelines
.
where
(
ref:
pipeline
.
ref
)
.
where
(
ref:
pipeline
.
ref
)
.
where
.
not
(
id:
pipeline
.
id
)
.
where
.
not
(
id:
pipeline
.
id
)
...
...
spec/services/ci/create_pipeline_service_spec.rb
View file @
cab0ccb9
...
@@ -317,9 +317,14 @@ describe Ci::CreatePipelineService do
...
@@ -317,9 +317,14 @@ describe Ci::CreatePipelineService do
context
'interruptible builds'
do
context
'interruptible builds'
do
before
do
before
do
Feature
.
enable
(
:ci_support_interruptible_pipelines
)
stub_ci_pipeline_yaml_file
(
YAML
.
dump
(
config
))
stub_ci_pipeline_yaml_file
(
YAML
.
dump
(
config
))
end
end
after
do
Feature
.
disable
(
:ci_support_interruptible_pipelines
)
end
let
(
:config
)
do
let
(
:config
)
do
{
{
stages:
%w[stage1 stage2 stage3 stage4]
,
stages:
%w[stage1 stage2 stage3 stage4]
,
...
...
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