diff --git a/config/feature_flags/beta/api_admin_token_revoke.yml b/config/feature_flags/beta/api_admin_token_revoke.yml deleted file mode 100644 index ed59738ebb85d0b3147b28889da671f44e246264..0000000000000000000000000000000000000000 --- a/config/feature_flags/beta/api_admin_token_revoke.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: api_admin_token_revoke -feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/499958 -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/170421 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/502413 -milestone: '17.7' -group: group::authentication -type: beta -default_enabled: true diff --git a/doc/api/admin/token.md b/doc/api/admin/token.md index 9e998ec2561c72a7521f3a6a9f1ddd052b6ffabb..d404b7d3e9e816fa1cdaa0f65c8622a91034f08a 100644 --- a/doc/api/admin/token.md +++ b/doc/api/admin/token.md @@ -116,7 +116,6 @@ Example response: {{< history >}} -- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/170421) in GitLab 17.7 [with a flag](../../administration/feature_flags/_index.md) named `api_admin_token_revoke`. Disabled by default. - [Cluster agent tokens added](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/178211) in GitLab 17.9. - [Runner authentication tokens added](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/179066) in GitLab 17.9. - [OAuth application secrets added](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/179035) in GitLab 17.9. diff --git a/lib/api/admin/token.rb b/lib/api/admin/token.rb index 0f2ff0eded5ff2cbf6dc3a4d464a30d8f64776b2..c85d9b65f4019cd7438b6347e1e595ba56dd358e 100644 --- a/lib/api/admin/token.rb +++ b/lib/api/admin/token.rb @@ -71,10 +71,6 @@ def track_admin_api_usage_event hidden true end delete do - if Feature.disabled?(:api_admin_token_revoke, current_user) - render_api_error!("'api_admin_token_revoke' feature flag is disabled", :not_found) - end - identified_token = identify_token(params[:token]) render_api_error!({ error: 'Not found' }, :not_found) if identified_token.revocable.nil? diff --git a/spec/requests/api/admin/token_spec.rb b/spec/requests/api/admin/token_spec.rb index 9e25ea9296aa41671af21e2dd7da21bbcfbef455..1aa691bdd240578edbc8e7d8ce91ced8166690c9 100644 --- a/spec/requests/api/admin/token_spec.rb +++ b/spec/requests/api/admin/token_spec.rb @@ -294,14 +294,6 @@ end end - context 'when the revocation feature is disabled' do - before do - stub_feature_flags(api_admin_token_revoke: false) - end - - it_behaves_like 'returning response status', :not_found - end - it_behaves_like 'rejecting invalid requests with admin' end