Commit a2f62b53 authored by Mike Greiling's avatar Mike Greiling

Merge branch 'alexives/cloud_run_feature_enabled_by_default' into 'master'

Enable the cloud run feature by default

See merge request gitlab-org/gitlab!21762
parents 012a7c15 245be697
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
%p.form-text.text-muted %p.form-text.text-muted
= s_('ClusterIntegration|Learn more about %{help_link_start_machine_type}machine types%{help_link_end} and %{help_link_start_pricing}pricing%{help_link_end}.').html_safe % { help_link_start_machine_type: help_link_start % { url: machine_type_link_url }, help_link_start_pricing: help_link_start % { url: pricing_link_url }, help_link_end: help_link_end } = s_('ClusterIntegration|Learn more about %{help_link_start_machine_type}machine types%{help_link_end} and %{help_link_start_pricing}pricing%{help_link_end}.').html_safe % { help_link_start_machine_type: help_link_start % { url: machine_type_link_url }, help_link_start_pricing: help_link_start % { url: pricing_link_url }, help_link_end: help_link_end }
- if Feature.enabled?(:create_cloud_run_clusters, clusterable) - if Feature.enabled?(:create_cloud_run_clusters, clusterable, default_enabled: true)
.form-group .form-group
= provider_gcp_field.check_box :cloud_run, { label: s_('ClusterIntegration|Enable Cloud Run on GKE (beta)'), = provider_gcp_field.check_box :cloud_run, { label: s_('ClusterIntegration|Enable Cloud Run on GKE (beta)'),
label_class: 'label-bold' } label_class: 'label-bold' }
......
---
title: Re-enable the cloud run feature
merge_request: https://gitlab.com/gitlab-org/gitlab/merge_requests/21762
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment