Merge branch '381358-move-cube_api_proxy-feature-flag-to-ee-2' into 'master'

Move cube_api_proxy feature flag to EE

See merge request !103288



Merged-by: James Fargher <proglottis@gmail.com>
Approved-by: Max Woolf <mwoolf@gitlab.com>
Approved-by: Jiaan Louw <3468028-jiaan@users.noreply.gitlab.com>
Approved-by: James Fargher <proglottis@gmail.com>
Co-authored-by: Axel García <agarcia@gitlab.com>

app/views/admin/application_settings/general.html.haml

@@ -119,7 +119,7 @@
 = render_if_exists 'admin/application_settings/feishu_integration'
 = render 'admin/application_settings/third_party_offers'
 = render 'admin/application_settings/snowplow'
-= render_if_exists 'admin/application_settings/product_analytics' if Feature.enabled?(:cube_api_proxy)
+= render_if_exists 'admin/application_settings/product_analytics'
 = render 'admin/application_settings/error_tracking' if Feature.enabled?(:gitlab_error_tracking)
 = render 'admin/application_settings/eks'
 = render 'admin/application_settings/floc'

ee/app/views/admin/application_settings/_product_analytics.html.haml

-- return unless License.feature_available?(:product_analytics)
+- return unless License.feature_available?(:product_analytics) && Feature.enabled?(:cube_api_proxy)
 - expanded = integration_expanded?('product_analytics_')
 
 %section.settings.as-product-analytics.no-animate#js-product-analytics-settings{ class: ('expanded' if expanded) }