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
096462db
Commit
096462db
authored
Sep 29, 2020
by
Andrew Fontaine
Committed by
Sarah Groff Hennigh-Palermo
Sep 29, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove ci_key_autocomplete Feature Flag
This has been enabled by default for quite some time with no issues.
parent
0a8ccb54
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1 addition
and
47 deletions
+1
-47
app/assets/javascripts/ci_variable_list/components/ci_variable_modal.vue
...scripts/ci_variable_list/components/ci_variable_modal.vue
+0
-16
app/controllers/projects/settings/ci_cd_controller.rb
app/controllers/projects/settings/ci_cd_controller.rb
+0
-1
config/feature_flags/development/ci_key_autocomplete.yml
config/feature_flags/development/ci_key_autocomplete.yml
+0
-7
spec/frontend/ci_variable_list/components/ci_variable_modal_spec.js
...end/ci_variable_list/components/ci_variable_modal_spec.js
+1
-23
No files found.
app/assets/javascripts/ci_variable_list/components/ci_variable_modal.vue
View file @
096462db
...
@@ -6,7 +6,6 @@ import {
...
@@ -6,7 +6,6 @@ import {
GlFormCheckbox
,
GlFormCheckbox
,
GlFormCombobox
,
GlFormCombobox
,
GlFormGroup
,
GlFormGroup
,
GlFormInput
,
GlFormSelect
,
GlFormSelect
,
GlFormTextarea
,
GlFormTextarea
,
GlIcon
,
GlIcon
,
...
@@ -41,7 +40,6 @@ export default {
...
@@ -41,7 +40,6 @@ export default {
GlFormCheckbox
,
GlFormCheckbox
,
GlFormCombobox
,
GlFormCombobox
,
GlFormGroup
,
GlFormGroup
,
GlFormInput
,
GlFormSelect
,
GlFormSelect
,
GlFormTextarea
,
GlFormTextarea
,
GlIcon
,
GlIcon
,
...
@@ -122,11 +120,6 @@ export default {
...
@@ -122,11 +120,6 @@ export default {
return
''
;
return
''
;
},
},
tokenValidationState
()
{
tokenValidationState
()
{
// If the feature flag is off, do not validate. Remove when flag is removed.
if
(
!
this
.
glFeatures
.
ciKeyAutocomplete
)
{
return
true
;
}
const
validator
=
this
.
$options
.
tokens
?.[
this
.
variable
.
key
]?.
validation
;
const
validator
=
this
.
$options
.
tokens
?.[
this
.
variable
.
key
]?.
validation
;
if
(
validator
)
{
if
(
validator
)
{
...
@@ -204,21 +197,12 @@ export default {
...
@@ -204,21 +197,12 @@ export default {
>
>
<form>
<form>
<gl-form-combobox
<gl-form-combobox
v-if=
"glFeatures.ciKeyAutocomplete"
v-model=
"key"
v-model=
"key"
:token-list=
"$options.tokenList"
:token-list=
"$options.tokenList"
:label-text=
"__('Key')"
:label-text=
"__('Key')"
data-qa-selector=
"ci_variable_key_field"
data-qa-selector=
"ci_variable_key_field"
/>
/>
<gl-form-group
v-else
:label=
"__('Key')"
label-for=
"ci-variable-key"
>
<gl-form-input
id=
"ci-variable-key"
v-model=
"key"
data-qa-selector=
"ci_variable_key_field"
/>
</gl-form-group>
<gl-form-group
<gl-form-group
:label=
"__('Value')"
:label=
"__('Value')"
label-for=
"ci-variable-value"
label-for=
"ci-variable-value"
...
...
app/controllers/projects/settings/ci_cd_controller.rb
View file @
096462db
...
@@ -8,7 +8,6 @@ module Projects
...
@@ -8,7 +8,6 @@ module Projects
before_action
do
before_action
do
push_frontend_feature_flag
(
:new_variables_ui
,
@project
,
default_enabled:
true
)
push_frontend_feature_flag
(
:new_variables_ui
,
@project
,
default_enabled:
true
)
push_frontend_feature_flag
(
:ajax_new_deploy_token
,
@project
)
push_frontend_feature_flag
(
:ajax_new_deploy_token
,
@project
)
push_frontend_feature_flag
(
:ci_key_autocomplete
,
default_enabled:
true
)
end
end
def
show
def
show
...
...
config/feature_flags/development/ci_key_autocomplete.yml
deleted
100644 → 0
View file @
0a8ccb54
---
name
:
ci_key_autocomplete
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29124
rollout_issue_url
:
group
:
group::progressive delivery
type
:
development
default_enabled
:
true
spec/frontend/ci_variable_list/components/ci_variable_modal_spec.js
View file @
096462db
import
Vuex
from
'
vuex
'
;
import
Vuex
from
'
vuex
'
;
import
{
createLocalVue
,
shallowMount
,
mount
}
from
'
@vue/test-utils
'
;
import
{
createLocalVue
,
shallowMount
,
mount
}
from
'
@vue/test-utils
'
;
import
{
GlButton
,
GlFormCombobox
}
from
'
@gitlab/ui
'
;
import
{
GlButton
}
from
'
@gitlab/ui
'
;
import
{
AWS_ACCESS_KEY_ID
}
from
'
~/ci_variable_list/constants
'
;
import
{
AWS_ACCESS_KEY_ID
}
from
'
~/ci_variable_list/constants
'
;
import
CiVariableModal
from
'
~/ci_variable_list/components/ci_variable_modal.vue
'
;
import
CiVariableModal
from
'
~/ci_variable_list/components/ci_variable_modal.vue
'
;
import
createStore
from
'
~/ci_variable_list/store
'
;
import
createStore
from
'
~/ci_variable_list/store
'
;
...
@@ -18,7 +18,6 @@ describe('Ci variable modal', () => {
...
@@ -18,7 +18,6 @@ describe('Ci variable modal', () => {
store
=
createStore
();
store
=
createStore
();
wrapper
=
method
(
CiVariableModal
,
{
wrapper
=
method
(
CiVariableModal
,
{
attachToDocument
:
true
,
attachToDocument
:
true
,
provide
:
{
glFeatures
:
{
ciKeyAutocomplete
:
true
}
},
stubs
:
{
stubs
:
{
GlModal
:
ModalStub
,
GlModal
:
ModalStub
,
},
},
...
@@ -42,27 +41,6 @@ describe('Ci variable modal', () => {
...
@@ -42,27 +41,6 @@ describe('Ci variable modal', () => {
wrapper
.
destroy
();
wrapper
.
destroy
();
});
});
describe
(
'
Feature flag
'
,
()
=>
{
describe
(
'
when off
'
,
()
=>
{
beforeEach
(()
=>
{
createComponent
(
shallowMount
,
{
provide
:
{
glFeatures
:
{
ciKeyAutocomplete
:
false
}
}
});
});
it
(
'
does not render the autocomplete dropdown
'
,
()
=>
{
expect
(
wrapper
.
find
(
GlFormCombobox
).
exists
()).
toBe
(
false
);
});
});
describe
(
'
when on
'
,
()
=>
{
beforeEach
(()
=>
{
createComponent
(
shallowMount
);
});
it
(
'
renders the autocomplete dropdown
'
,
()
=>
{
expect
(
wrapper
.
find
(
GlFormCombobox
).
exists
()).
toBe
(
true
);
});
});
});
describe
(
'
Basic interactions
'
,
()
=>
{
describe
(
'
Basic interactions
'
,
()
=>
{
beforeEach
(()
=>
{
beforeEach
(()
=>
{
createComponent
(
shallowMount
);
createComponent
(
shallowMount
);
...
...
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