diff --git a/config/feature_flags/development/namespace_limits_admin_dashboard.yml b/config/feature_flags/development/namespace_limits_admin_dashboard.yml deleted file mode 100644 index 12706a8e3f9a7178af41ede200dc346ac9ab38f9..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/namespace_limits_admin_dashboard.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: namespace_limits_admin_dashboard -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115704 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/399220 -milestone: '15.11' -type: development -group: group::utilization -default_enabled: false diff --git a/ee/app/controllers/admin/namespace_limits_controller.rb b/ee/app/controllers/admin/namespace_limits_controller.rb index 998ac744966f019db0e09bd7dd31584a39bfb059..90093e941306e77cbd83883079e9cb4044ec322f 100644 --- a/ee/app/controllers/admin/namespace_limits_controller.rb +++ b/ee/app/controllers/admin/namespace_limits_controller.rb @@ -5,7 +5,6 @@ class NamespaceLimitsController < Admin::ApplicationController feature_category :consumables_cost_management urgency :low - before_action :check_dashboard_enabled before_action :check_gitlab_com def index; end @@ -15,9 +14,5 @@ def index; end def check_gitlab_com not_found unless ::Gitlab::CurrentSettings.should_check_namespace_plan? end - - def check_dashboard_enabled - not_found unless ::Feature.enabled?(:namespace_limits_admin_dashboard, current_user) - end end end diff --git a/ee/spec/requests/admin/namespace_limits_controller_spec.rb b/ee/spec/requests/admin/namespace_limits_controller_spec.rb index 5a16f0b8ce67ec602895e43003458ccf6475a6bb..f9af3f28dfaf0fd4490f81e93b7568b09aab30ec 100644 --- a/ee/spec/requests/admin/namespace_limits_controller_spec.rb +++ b/ee/spec/requests/admin/namespace_limits_controller_spec.rb @@ -38,14 +38,6 @@ context 'when not on .com' do it_behaves_like 'not found' end - - context 'when :namespace_limits_admin_dashboard is disabled' do - before do - stub_feature_flags(namespace_limits_admin_dashboard: false) - end - - it_behaves_like 'not found' - end end context 'with non-admin user' do