From f4d4fb41a5396d5556c3cf850c8edf0466a0b236 Mon Sep 17 00:00:00 2001 From: Chad Woolley Date: Tue, 8 Apr 2025 00:52:06 -0700 Subject: [PATCH] Add ignore for rubocop Gitlab/FeatureFlagKeyDynamic --- .rubocop_todo/gitlab/feature_flag_key_dynamic.yml | 1 - .../workspaces_feature_flag_controller.rb | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.rubocop_todo/gitlab/feature_flag_key_dynamic.yml b/.rubocop_todo/gitlab/feature_flag_key_dynamic.yml index e56cffff60c661..124c791a746670 100644 --- a/.rubocop_todo/gitlab/feature_flag_key_dynamic.yml +++ b/.rubocop_todo/gitlab/feature_flag_key_dynamic.yml @@ -9,7 +9,6 @@ Gitlab/FeatureFlagKeyDynamic: - 'app/services/service_desk_settings/update_service.rb' - 'app/workers/concerns/worker_attributes.rb' - 'app/workers/loose_foreign_keys/cleanup_worker.rb' - - 'ee/app/controllers/remote_development/workspaces_feature_flag_controller.rb' - 'ee/app/graphql/resolvers/ai/user_available_features_resolver.rb' - 'ee/app/graphql/resolvers/ai/user_code_suggestions_contexts_resolver.rb' - 'ee/app/models/concerns/geo/verifiable_replicator.rb' diff --git a/ee/app/controllers/remote_development/workspaces_feature_flag_controller.rb b/ee/app/controllers/remote_development/workspaces_feature_flag_controller.rb index 507bad2bf4bcc1..35b245048ddbec 100644 --- a/ee/app/controllers/remote_development/workspaces_feature_flag_controller.rb +++ b/ee/app/controllers/remote_development/workspaces_feature_flag_controller.rb @@ -5,13 +5,14 @@ module RemoteDevelopment # based on what choices a user makes on the page. As such, we cannot rely on the normal approach # of passing the flag's state in the original body of the page, rather we would need to query # it in realtime based on the current selected actor. In this case, it is the namespace. - # TODO: this will be cleaned up as part of gitlab-org/gitlab#482814+ + # TODO: This will be cleaned up as part of https://gitlab.com/gitlab-org/gitlab/-/issues/482814 class WorkspacesFeatureFlagController < ApplicationController feature_category :workspaces urgency :low ALLOWED_FLAGS = [].freeze + # @return [void] def show flag = permitted_params[:flag] @@ -23,7 +24,7 @@ def show return render json: { enabled: false } unless namespace begin - render json: { enabled: Feature.enabled?(flag.to_sym, namespace.root_ancestor) } + render json: { enabled: Feature.enabled?(flag.to_sym, namespace.root_ancestor) } # rubocop:disable Gitlab/FeatureFlagKeyDynamic -- This is intentionally dynamic rescue Feature::InvalidFeatureFlagError render json: { enabled: false } end @@ -31,6 +32,7 @@ def show private + # @return [ActionController::Parameters] def permitted_params params.permit(:flag, :namespace_id) end -- GitLab