diff --git a/config/feature_flags/gitlab_com_derisk/ci_runner_manager_runtime_features.yml b/config/feature_flags/gitlab_com_derisk/ci_runner_manager_runtime_features.yml deleted file mode 100644 index 26bfc852c8f06063844b30366cd0e319eaa099e3..0000000000000000000000000000000000000000 --- a/config/feature_flags/gitlab_com_derisk/ci_runner_manager_runtime_features.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: ci_runner_manager_runtime_features -feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/519966 -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/181817 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/520116 -milestone: '17.10' -group: group::ci platform -type: gitlab_com_derisk -default_enabled: false diff --git a/lib/api/ci/helpers/runner.rb b/lib/api/ci/helpers/runner.rb index 6958c64490cdb8cc465cf16345e5fe2eb75ab378..0865985dc5b1d92d3f1862c357891f91dfdddcf8 100644 --- a/lib/api/ci/helpers/runner.rb +++ b/lib/api/ci/helpers/runner.rb @@ -242,8 +242,6 @@ def get_runner_config_from_request end def get_runner_features_from_request - return {} unless Feature.enabled?(:ci_runner_manager_runtime_features, current_runner) - { runtime_features: attributes_for_keys(%w[features], params['info'])['features'] }.compact end