diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-18 00:07:52 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-18 00:07:52 +0300 |
| commit | 2d96e61ceb1a3f26283dfba43f85d99488752296 (patch) | |
| tree | 9687e475f6292499721f6acab4182b5f31599e5b /app/views/clusters | |
| parent | e72386771751fb22245bc6604fef236a2ee130cb (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/clusters')
| -rw-r--r-- | app/views/clusters/clusters/gcp/_form.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/clusters/clusters/gcp/_form.html.haml b/app/views/clusters/clusters/gcp/_form.html.haml index 95670a2ec87..ab01569b8fd 100644 --- a/app/views/clusters/clusters/gcp/_form.html.haml +++ b/app/views/clusters/clusters/gcp/_form.html.haml @@ -64,7 +64,7 @@ %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 } - - if Feature.enabled?(:create_cloud_run_clusters, clusterable) + - if Feature.enabled?(:create_cloud_run_clusters, clusterable, default_enabled: true) .form-group = provider_gcp_field.check_box :cloud_run, { label: s_('ClusterIntegration|Enable Cloud Run on GKE (beta)'), label_class: 'label-bold' } |