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
7895224f
Commit
7895224f
authored
Dec 25, 2020
by
Furkan Ayhan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove FF ci_bridge_dependency_variables
It is already enabled by default.
parent
298ebf6f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
27 deletions
+0
-27
app/models/ci/bridge.rb
app/models/ci/bridge.rb
+0
-8
config/feature_flags/development/ci_bridge_dependency_variables.yml
...ture_flags/development/ci_bridge_dependency_variables.yml
+0
-7
spec/models/ci/bridge_spec.rb
spec/models/ci/bridge_spec.rb
+0
-12
No files found.
app/models/ci/bridge.rb
View file @
7895224f
...
...
@@ -7,7 +7,6 @@ module Ci
include
Importable
include
AfterCommitQueue
include
Ci
::
HasRef
extend
::
Gitlab
::
Utils
::
Override
InvalidBridgeTypeError
=
Class
.
new
(
StandardError
)
InvalidTransitionError
=
Class
.
new
(
StandardError
)
...
...
@@ -200,13 +199,6 @@ module Ci
end
end
override
:dependency_variables
def
dependency_variables
return
[]
unless
::
Feature
.
enabled?
(
:ci_bridge_dependency_variables
,
project
,
default_enabled:
true
)
super
end
def
target_revision_ref
downstream_pipeline_params
.
dig
(
:target_revision
,
:ref
)
end
...
...
config/feature_flags/development/ci_bridge_dependency_variables.yml
deleted
100644 → 0
View file @
298ebf6f
---
name
:
ci_bridge_dependency_variables
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46530
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/273734
type
:
development
group
:
group::pipeline authoring
default_enabled
:
true
spec/models/ci/bridge_spec.rb
View file @
7895224f
...
...
@@ -356,14 +356,6 @@ RSpec.describe Ci::Bridge do
describe
'#dependency_variables'
do
subject
{
bridge
.
dependency_variables
}
shared_context
'when ci_bridge_dependency_variables is disabled'
do
before
do
stub_feature_flags
(
ci_bridge_dependency_variables:
false
)
end
it
{
is_expected
.
to
be_empty
}
end
context
'when downloading from previous stages'
do
let!
(
:prepare1
)
{
create
(
:ci_build
,
name:
'prepare1'
,
pipeline:
pipeline
,
stage_idx:
0
)
}
let!
(
:bridge
)
{
create
(
:ci_bridge
,
pipeline:
pipeline
,
stage_idx:
1
)
}
...
...
@@ -374,8 +366,6 @@ RSpec.describe Ci::Bridge do
it
'inherits only dependent variables'
do
expect
(
subject
.
to_hash
).
to
eq
(
job_variable_1
.
key
=>
job_variable_1
.
value
)
end
it_behaves_like
'when ci_bridge_dependency_variables is disabled'
end
context
'when using needs'
do
...
...
@@ -397,8 +387,6 @@ RSpec.describe Ci::Bridge do
it
'inherits only needs with artifacts variables'
do
expect
(
subject
.
to_hash
).
to
eq
(
job_variable_1
.
key
=>
job_variable_1
.
value
)
end
it_behaves_like
'when ci_bridge_dependency_variables is disabled'
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