diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2019-03-21 22:07:20 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2019-03-21 22:07:20 +0000 |
| commit | 24c496f155fed9ef0abdbba8ab5918bdb4b59874 (patch) | |
| tree | 49e468ecc8d45c9f9face37d50265131e61dea83 | |
| parent | 4c6219d2e61301c40bbcf0d255b8693ac65672f2 (diff) | |
| parent | f6e8d2e358ea1160e3a41bd9cdf1a95b7f955570 (diff) | |
| download | gitlab-ce-24c496f155fed9ef0abdbba8ab5918bdb4b59874.tar.gz | |
Merge branch '56944-kubernetes-create-cluster-add-help-text-to-environment-field' into 'master'
Resolve "Kubernetes > Create cluster > Add help text to environment field"
Closes #56944
See merge request gitlab-org/gitlab-ce!25891
| -rw-r--r-- | app/views/clusters/clusters/gcp/_form.html.haml | 8 | ||||
| -rw-r--r-- | app/views/clusters/clusters/user/_form.html.haml | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app/views/clusters/clusters/gcp/_form.html.haml b/app/views/clusters/clusters/gcp/_form.html.haml index 8ed4666e79a..00582e19662 100644 --- a/app/views/clusters/clusters/gcp/_form.html.haml +++ b/app/views/clusters/clusters/gcp/_form.html.haml @@ -17,9 +17,11 @@ .form-group = field.label :name, s_('ClusterIntegration|Kubernetes cluster name'), class: 'label-bold' = field.text_field :name, class: 'form-control', placeholder: s_('ClusterIntegration|Kubernetes cluster name') - .form-group - = field.label :environment_scope, s_('ClusterIntegration|Environment scope'), class: 'label-bold' - = field.text_field :environment_scope, class: 'form-control', readonly: !has_multiple_clusters?, placeholder: s_('ClusterIntegration|Environment scope') + - if has_multiple_clusters? + .form-group + = field.label :environment_scope, s_('ClusterIntegration|Environment scope'), class: 'label-bold' + = field.text_field :environment_scope, class: 'form-control', placeholder: s_('ClusterIntegration|Environment scope') + .form-text.text-muted= s_("ClusterIntegration|Choose which of your environments will use this cluster.") = field.fields_for :provider_gcp, @gcp_cluster.provider_gcp do |provider_gcp_field| .form-group diff --git a/app/views/clusters/clusters/user/_form.html.haml b/app/views/clusters/clusters/user/_form.html.haml index 9793c77fc2b..136f98d0126 100644 --- a/app/views/clusters/clusters/user/_form.html.haml +++ b/app/views/clusters/clusters/user/_form.html.haml @@ -7,6 +7,7 @@ .form-group = field.label :environment_scope, s_('ClusterIntegration|Environment scope'), class: 'label-bold' = field.text_field :environment_scope, class: 'form-control', placeholder: s_('ClusterIntegration|Environment scope') + .form-text.text-muted= s_("ClusterIntegration|Choose which of your environments will use this cluster.") = field.fields_for :platform_kubernetes, @user_cluster.platform_kubernetes do |platform_kubernetes_field| .form-group |