diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2019-09-02 19:57:53 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2019-09-02 19:57:53 +0000 |
| commit | e6fb109d459d9aed8401df5faab4f7c91f8f3429 (patch) | |
| tree | 2c6fe2be0d81d4a5a0ae47a938e291cc6f6fd9a5 | |
| parent | 138d886d0d9d7c55bbc1bab4233810aa8f5593c0 (diff) | |
| parent | 237de5c728c15de70f24ca11e0c51cec866f54ee (diff) | |
| download | gitlab-ce-e6fb109d459d9aed8401df5faab4f7c91f8f3429.tar.gz | |
Merge branch 'cluster-form-ca-cert-larger' into 'master'
Expand textarea for CA cert in cluster form
See merge request gitlab-org/gitlab-ce!32508
| -rw-r--r-- | app/views/clusters/clusters/user/_form.html.haml | 1 | ||||
| -rw-r--r-- | app/views/clusters/platforms/kubernetes/_form.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/cluster-form-ca-cert-larger.yml | 5 |
3 files changed, 7 insertions, 1 deletions
diff --git a/app/views/clusters/clusters/user/_form.html.haml b/app/views/clusters/clusters/user/_form.html.haml index 1d212553c3b..5507f12b73b 100644 --- a/app/views/clusters/clusters/user/_form.html.haml +++ b/app/views/clusters/clusters/user/_form.html.haml @@ -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 } diff --git a/app/views/clusters/platforms/kubernetes/_form.html.haml b/app/views/clusters/platforms/kubernetes/_form.html.haml index e50c573bd90..41701b5614a 100644 --- a/app/views/clusters/platforms/kubernetes/_form.html.haml +++ b/app/views/clusters/platforms/kubernetes/_form.html.haml @@ -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', diff --git a/changelogs/unreleased/cluster-form-ca-cert-larger.yml b/changelogs/unreleased/cluster-form-ca-cert-larger.yml new file mode 100644 index 00000000000..ed38d003a37 --- /dev/null +++ b/changelogs/unreleased/cluster-form-ca-cert-larger.yml @@ -0,0 +1,5 @@ +--- +title: Expand textarea for CA cert in cluster form +merge_request: 32508 +author: +type: fixed |