diff --git a/app/services/ci/list_config_variables_service.rb b/app/services/ci/list_config_variables_service.rb index 6742e31551ab4ad42145cb85fed067cf8128881a..35b59eb63b76b043689679bdd3fd1cc22b9123ac 100644 --- a/app/services/ci/list_config_variables_service.rb +++ b/app/services/ci/list_config_variables_service.rb @@ -28,8 +28,7 @@ def calculate_reactive_cache(sha) return {} unless config.exists? - ref_name = Gitlab::Ci::RefFinder.new(project).find_by_sha(sha) if Feature.enabled?( - :project_ref_name_in_variables, project) + ref_name = Gitlab::Ci::RefFinder.new(project).find_by_sha(sha) result = Gitlab::Ci::YamlProcessor.new( config.content, diff --git a/config/feature_flags/gitlab_com_derisk/project_ref_name_in_variables.yml b/config/feature_flags/gitlab_com_derisk/project_ref_name_in_variables.yml deleted file mode 100644 index a3e4763423dc7adb855108f7f06ec4e96a4ec802..0000000000000000000000000000000000000000 --- a/config/feature_flags/gitlab_com_derisk/project_ref_name_in_variables.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: project_ref_name_in_variables -feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/430786 -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/155868 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/466427 -milestone: '17.2' -group: group::pipeline authoring -type: gitlab_com_derisk -default_enabled: false diff --git a/spec/services/ci/list_config_variables_service_spec.rb b/spec/services/ci/list_config_variables_service_spec.rb index 2c3ea7d2880b49b0a0d1db876449af5a216d1830..3e04286bab80262db9c0bed31912a9998a76b3f2 100644 --- a/spec/services/ci/list_config_variables_service_spec.rb +++ b/spec/services/ci/list_config_variables_service_spec.rb @@ -213,21 +213,6 @@ expect(result['COMMON_VAR']).to eq({ value: 'include_two', description: 'Common variable' }) end end - - context 'when feature flag is disabled in the project' do - before do - stub_feature_flags(project_ref_name_in_variables: false) - end - - it 'passes nil as the ref name to YamlProcessor' do - expect(Gitlab::Ci::YamlProcessor) - .to receive(:new) - .with(anything, a_hash_including(ref: nil)) - .and_call_original - - result - end - end end context 'when project CI config is external' do