Commit 70c743ec authored by Sarah Groff Hennigh-Palermo's avatar Sarah Groff Hennigh-Palermo

Merge branch 'remove-ci-key-autocomplete-flag' into 'master'

Remove ci_key_autocomplete Feature Flag

See merge request gitlab-org/gitlab!43596
parents 4dbac420 096462db
......@@ -6,7 +6,6 @@ import {
GlFormCheckbox,
GlFormCombobox,
GlFormGroup,
GlFormInput,
GlFormSelect,
GlFormTextarea,
GlIcon,
......@@ -41,7 +40,6 @@ export default {
GlFormCheckbox,
GlFormCombobox,
GlFormGroup,
GlFormInput,
GlFormSelect,
GlFormTextarea,
GlIcon,
......@@ -122,11 +120,6 @@ export default {
return '';
},
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;
if (validator) {
......@@ -204,21 +197,12 @@ export default {
>
<form>
<gl-form-combobox
v-if="glFeatures.ciKeyAutocomplete"
v-model="key"
:token-list="$options.tokenList"
:label-text="__('Key')"
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
:label="__('Value')"
label-for="ci-variable-value"
......
......@@ -8,7 +8,6 @@ module Projects
before_action do
push_frontend_feature_flag(:new_variables_ui, @project, default_enabled: true)
push_frontend_feature_flag(:ajax_new_deploy_token, @project)
push_frontend_feature_flag(:ci_key_autocomplete, default_enabled: true)
end
def show
......
---
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
import Vuex from 'vuex';
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 CiVariableModal from '~/ci_variable_list/components/ci_variable_modal.vue';
import createStore from '~/ci_variable_list/store';
......@@ -18,7 +18,6 @@ describe('Ci variable modal', () => {
store = createStore();
wrapper = method(CiVariableModal, {
attachToDocument: true,
provide: { glFeatures: { ciKeyAutocomplete: true } },
stubs: {
GlModal: ModalStub,
},
......@@ -42,27 +41,6 @@ describe('Ci variable modal', () => {
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', () => {
beforeEach(() => {
createComponent(shallowMount);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment