diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-02 09:07:54 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-02 09:07:54 +0000 |
commit | 26eb09cbe9c3cc9fc78ad1be7e66e85b5645844b (patch) | |
tree | 952d0c672a07f48b66ec9923992fd6bc6f73a5fd /app/views/clusters | |
parent | 127ab291e2c8b66ac5502257ac9e280acf257089 (diff) | |
download | gitlab-ce-26eb09cbe9c3cc9fc78ad1be7e66e85b5645844b.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/clusters')
-rw-r--r-- | app/views/clusters/clusters/_banner.html.haml | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/app/views/clusters/clusters/_banner.html.haml b/app/views/clusters/clusters/_banner.html.haml index 6d902132c73..1ca4f9c670e 100644 --- a/app/views/clusters/clusters/_banner.html.haml +++ b/app/views/clusters/clusters/_banner.html.haml @@ -6,17 +6,19 @@ %span.gl-spinner.gl-spinner-dark{ 'aria-label': 'Loading' } %span.gl-ml-2= s_('ClusterIntegration|Kubernetes cluster is being created...') -.hidden.row.js-cluster-api-unreachable.gl-alert.gl-alert-warning{ role: 'alert' } - = sprite_icon('warning', css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title') - %button.js-close.gl-alert-dismiss{ type: 'button', 'aria-label' => _('Dismiss') } - = sprite_icon('close', css_class: 'gl-icon') += render 'shared/global_alert', + variant: :warning, + alert_class: 'hidden js-cluster-api-unreachable', + is_contained: true, + close_button_class: 'js-close' do .gl-alert-body = s_('ClusterIntegration|Your cluster API is unreachable. Please ensure your API URL is correct.') -.hidden.js-cluster-authentication-failure.js-cluster-api-unreachable.gl-alert.gl-alert-warning{ role: 'alert' } - = sprite_icon('warning', css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title') - %button.js-close.gl-alert-dismiss{ type: 'button', 'aria-label' => _('Dismiss') } - = sprite_icon('close', css_class: 'gl-icon') += render 'shared/global_alert', + variant: :warning, + alert_class: 'hidden js-cluster-authentication-failure js-cluster-api-unreachable', + is_contained: true, + close_button_class: 'js-close' do .gl-alert-body = s_('ClusterIntegration|There was a problem authenticating with your cluster. Please ensure your CA Certificate and Token are valid.') |