diff --git a/app/assets/javascripts/ci/ci_variable_list/components/ci_group_variables.vue b/app/assets/javascripts/ci/ci_variable_list/components/ci_group_variables.vue index 2045b127a8228f0829da0fe17e0adce64c8080c8..842d88e1267d682b2ec3040009f8a74d73bac6c7 100644 --- a/app/assets/javascripts/ci/ci_variable_list/components/ci_group_variables.vue +++ b/app/assets/javascripts/ci/ci_variable_list/components/ci_group_variables.vue @@ -23,15 +23,6 @@ export default { graphqlId() { return convertToGraphQLId(TYPENAME_GROUP, this.groupId); }, - queriesAvailable() { - if (this.glFeatures.ciGroupEnvScopeGraphql) { - return this.$options.queryData; - } - - return { - ciVariables: this.$options.queryData.ciVariables, - }; - }, }, mutationData: { [ADD_MUTATION_ACTION]: addGroupVariable, @@ -59,6 +50,6 @@ export default { entity="group" :full-path="groupPath" :mutation-data="$options.mutationData" - :query-data="queriesAvailable" + :query-data="$options.queryData" /> </template> diff --git a/app/controllers/groups/settings/ci_cd_controller.rb b/app/controllers/groups/settings/ci_cd_controller.rb index 169caabf9d8a017b66170645a8df41e594912b33..4bbaf92b126084a2b5a46c4f95222686f3694ec9 100644 --- a/app/controllers/groups/settings/ci_cd_controller.rb +++ b/app/controllers/groups/settings/ci_cd_controller.rb @@ -14,7 +14,6 @@ class CiCdController < Groups::ApplicationController feature_category :continuous_integration before_action do - push_frontend_feature_flag(:ci_group_env_scope_graphql, group) push_frontend_feature_flag(:ci_variables_pages, current_user) end diff --git a/config/feature_flags/development/ci_group_env_scope_graphql.yml b/config/feature_flags/development/ci_group_env_scope_graphql.yml deleted file mode 100644 index 04b080c67d4ce33297fc6a00cba54a2eb80f38de..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/ci_group_env_scope_graphql.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: ci_group_env_scope_graphql -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124134 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/416385 -milestone: '16.2' -type: development -group: group::pipeline security -default_enabled: false diff --git a/spec/frontend/ci/ci_variable_list/components/ci_group_variables_spec.js b/spec/frontend/ci/ci_variable_list/components/ci_group_variables_spec.js index b364f098a3adffb1b49298049c728d9446dc732c..567a49d663c47ef82c0106fbecc65c30e0dd4c3b 100644 --- a/spec/frontend/ci/ci_variable_list/components/ci_group_variables_spec.js +++ b/spec/frontend/ci/ci_variable_list/components/ci_group_variables_spec.js @@ -30,7 +30,6 @@ describe('Ci Group Variable wrapper', () => { provide: { ...mockProvide, glFeatures: { - ciGroupEnvScopeGraphql: false, groupScopedCiVariables: false, ...featureFlags, }, @@ -61,6 +60,10 @@ describe('Ci Group Variable wrapper', () => { lookup: expect.any(Function), query: getGroupVariables, }, + environments: { + lookup: expect.any(Function), + query: getGroupEnvironments, + }, }, refetchAfterMutation: false, }); @@ -88,26 +91,4 @@ describe('Ci Group Variable wrapper', () => { }); }); }); - - describe('ciGroupEnvScopeGraphql feature flag', () => { - describe('When enabled', () => { - beforeEach(() => { - createComponent({ featureFlags: { ciGroupEnvScopeGraphql: true } }); - }); - - it('Passes down environments query to variable shared component', () => { - expect(findCiShared().props('queryData').environments.query).toBe(getGroupEnvironments); - }); - }); - - describe('When disabled', () => { - beforeEach(() => { - createComponent(); - }); - - it('Does not pass down environments query to variable shared component', () => { - expect(findCiShared().props('queryData').environments).toBe(undefined); - }); - }); - }); });