summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/create_cluster
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-19 09:07:39 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-19 09:07:39 +0000
commite3d67bcff7b8bc6a453d0814d404a9a61d97bc0f (patch)
tree75cafd958ccb2c1977815f1b001b29a0ce17d90b /app/assets/javascripts/create_cluster
parent6287caa6fad6e2b69c23bdba3bcca6bdfd82c8ff (diff)
downloadgitlab-ce-e3d67bcff7b8bc6a453d0814d404a9a61d97bc0f.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/create_cluster')
-rw-r--r--app/assets/javascripts/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/assets/javascripts/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue b/app/assets/javascripts/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue
index d04d0ff2a6d..f5a67299dde 100644
--- a/app/assets/javascripts/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue
+++ b/app/assets/javascripts/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue
@@ -342,7 +342,6 @@ export default {
:empty-text="s__('ClusterIntegration|Kubernetes version not found')"
@input="setKubernetesVersion({ kubernetesVersion: $event })"
/>
- <p class="form-text text-muted" v-html="roleDropdownHelpText"></p>
</div>
<div class="form-group">
<label class="label-bold" for="eks-role">{{ s__('ClusterIntegration|Role name') }}</label>