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
d851833f
Commit
d851833f
authored
Mar 17, 2020
by
Marius Bobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove ci_pre_post_pipeline_stages feature flag
parent
a5004c79
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
24 deletions
+1
-24
lib/gitlab/ci/config.rb
lib/gitlab/ci/config.rb
+1
-4
spec/lib/gitlab/ci/config_spec.rb
spec/lib/gitlab/ci/config_spec.rb
+0
-20
No files found.
lib/gitlab/ci/config.rb
View file @
d851833f
...
@@ -76,10 +76,7 @@ module Gitlab
...
@@ -76,10 +76,7 @@ module Gitlab
initial_config
=
Gitlab
::
Config
::
Loader
::
Yaml
.
new
(
config
).
load!
initial_config
=
Gitlab
::
Config
::
Loader
::
Yaml
.
new
(
config
).
load!
initial_config
=
Config
::
External
::
Processor
.
new
(
initial_config
,
@context
).
perform
initial_config
=
Config
::
External
::
Processor
.
new
(
initial_config
,
@context
).
perform
initial_config
=
Config
::
Extendable
.
new
(
initial_config
).
to_hash
initial_config
=
Config
::
Extendable
.
new
(
initial_config
).
to_hash
initial_config
=
Config
::
EdgeStagesInjector
.
new
(
initial_config
).
to_hash
if
Feature
.
enabled?
(
:ci_pre_post_pipeline_stages
,
@context
.
project
,
default_enabled:
true
)
initial_config
=
Config
::
EdgeStagesInjector
.
new
(
initial_config
).
to_hash
end
initial_config
initial_config
end
end
...
...
spec/lib/gitlab/ci/config_spec.rb
View file @
d851833f
...
@@ -79,26 +79,6 @@ describe Gitlab::Ci::Config do
...
@@ -79,26 +79,6 @@ describe Gitlab::Ci::Config do
it
{
is_expected
.
to
eq
%w[.pre stage1 stage2 .post]
}
it
{
is_expected
.
to
eq
%w[.pre stage1 stage2 .post]
}
end
end
context
'with feature disabled'
do
before
do
stub_feature_flags
(
ci_pre_post_pipeline_stages:
false
)
end
let
(
:yml
)
do
<<-
EOS
stages:
- stage1
- stage2
job1:
stage: stage1
script:
- ls
EOS
end
it
{
is_expected
.
to
eq
%w[stage1 stage2]
}
end
end
end
end
end
...
...
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