kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'cluster-form-ca-cert-larger' into 'master'

Browse source 
Expand textarea for CA cert in cluster form

See merge request gitlab-org/gitlab-ce!32508
This commit is contained in:
Tim Zallmann 2019-09-02 19:57:53 +00:00
commit e6fb109d45
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/views/clusters/clusters/user/_form.html.haml
View file

@ -25,6 +25,7 @@
help: '%{help_text} %{help_link}'.html_safe % { help_text: api_url_help_text, help_link: more_info_link }
= platform_kubernetes_field.text_area :ca_cert,
rows: '10',
placeholder: s_('ClusterIntegration|Certificate Authority bundle (PEM format)'),
label: s_('ClusterIntegration|CA Certificate'), label_class: 'label-bold',
help: '%{help_text} %{help_link}'.html_safe % { help_text: ca_cert_help_text, help_link: more_info_link }

2
app/views/clusters/platforms/kubernetes/_form.html.haml
View file

@ -19,7 +19,7 @@
- copy_ca_cert_btn = clipboard_button(text: platform.ca_cert, title: s_('ClusterIntegration|Copy CA Certificate'),
class: 'input-group-text btn-default') if cluster.read_only_kubernetes_platform_fields?
= platform_field.text_area :ca_cert, class: 'js-select-on-focus', rows: '5',
= platform_field.text_area :ca_cert, class: 'js-select-on-focus', rows: '10',
readonly: cluster.read_only_kubernetes_platform_fields?,
placeholder: s_('ClusterIntegration|Certificate Authority bundle (PEM format)'),
label: s_('ClusterIntegration|CA Certificate'), label_class: 'label-bold',

5
changelogs/unreleased/cluster-form-ca-cert-larger.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Expand textarea for CA cert in cluster form
merge_request: 32508
author:
type: fixed