1 files changed, 2 insertions, 8 deletions
diff --git a/app/controllers/projects/settings/ci_cd_controller.rb b/app/controllers/projects/settings/ci_cd_controller.rb
index ee50327be8f..cda6c8abea7 100644
--- a/app/controllers/projects/settings/ci_cd_controller.rb
+++ b/app/controllers/projects/settings/ci_cd_controller.rb
@@ -13,6 +13,7 @@ module Projects
       before_action :define_variables
       before_action do
         push_frontend_feature_flag(:ajax_new_deploy_token, @project)
+        push_frontend_feature_flag(:ci_variable_settings_graphql, @project)
       end
 
       helper_method :highlight_badge
@@ -27,14 +28,7 @@ module Projects
           ).to_json
         end
 
-        if current_user.ci_owned_runners_cross_joins_fix_enabled?
-          render
-        else
-          # @assignable_runners is using ci_owned_runners
-          ::Gitlab::Database.allow_cross_joins_across_databases(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/336436') do
-            render
-          end
-        end
+        render
       end
 
       def update