summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorThong Kuah <tkuah@gitlab.com>2019-06-18 01:11:48 +0000
committerThong Kuah <tkuah@gitlab.com>2019-06-18 01:11:48 +0000
commitdb9ef69272155b3c8ead5c0e7d027bda2b623d43 (patch)
treef95645eb6a20e0613c5f4d02b01bb4a34ee5205c /app/views
parent1276ff85453c6331e53f79680627c981b5ef00f7 (diff)
parent5aa9b710be2e03b296b68942d4053fa0a24e884c (diff)
downloadgitlab-ce-db9ef69272155b3c8ead5c0e7d027bda2b623d43.tar.gz
Merge branch '60617-allow-switching-from-gitlab-managed-to-unmanaged-clusters' into 'master'
Allow switching clusters between managed/unmanaged Closes #60617 See merge request gitlab-org/gitlab-ce!29322
Diffstat (limited to 'app/views')
-rw-r--r--app/views/clusters/platforms/kubernetes/_form.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/clusters/platforms/kubernetes/_form.html.haml b/app/views/clusters/platforms/kubernetes/_form.html.haml
index c1727cf9079..f2e44462226 100644
--- a/app/views/clusters/platforms/kubernetes/_form.html.haml
+++ b/app/views/clusters/platforms/kubernetes/_form.html.haml
@@ -48,7 +48,7 @@
= s_('ClusterIntegration|This option will allow you to install applications on RBAC clusters.')
.form-group
- = field.check_box :managed, { disabled: true, label: s_('ClusterIntegration|GitLab-managed cluster'),
+ = field.check_box :managed, { label: s_('ClusterIntegration|GitLab-managed cluster'),
label_class: 'label-bold' }
.form-text.text-muted
= s_('ClusterIntegration|Allow GitLab to manage namespace and service accounts for this cluster.')