diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-23 21:09:28 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-23 21:09:28 +0000 |
| commit | 1949d08c1a3089e2189fe7ab610467f369793bf1 (patch) | |
| tree | 5602659ff18d268e8af70d0235d1a3319a01cc9e /app/views/clusters | |
| parent | c5d67a0495ba5bd66f72b9a02da4d351c027c6bd (diff) | |
| download | gitlab-ce-1949d08c1a3089e2189fe7ab610467f369793bf1.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/clusters')
| -rw-r--r-- | app/views/clusters/clusters/_advanced_settings.html.haml | 6 | ||||
| -rw-r--r-- | app/views/clusters/clusters/_provider_details_form.html.haml | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/app/views/clusters/clusters/_advanced_settings.html.haml b/app/views/clusters/clusters/_advanced_settings.html.haml index 117bdbc06a1..34ff1b5d758 100644 --- a/app/views/clusters/clusters/_advanced_settings.html.haml +++ b/app/views/clusters/clusters/_advanced_settings.html.haml @@ -24,8 +24,7 @@ .text-muted = html_escape(s_('ClusterIntegration|A cluster management project can be used to run deployment jobs with Kubernetes %{code_open}cluster-admin%{code_close} privileges.')) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe } = link_to _('More information'), help_page_path('user/clusters/management_project.md'), target: '_blank' - .gl-display-flex.gl-justify-content-end - = field.submit _('Save changes'), class: 'btn btn-success' + = field.submit _('Save changes'), class: 'btn btn-success' - if @cluster.managed? .sub-section.form-group @@ -33,8 +32,7 @@ = s_('ClusterIntegration|Clear cluster cache') %p = s_("ClusterIntegration|Clear the local cache of namespace and service accounts. This is necessary if your integration has become out of sync. The cache is repopulated during the next CI job that requires namespace and service accounts.") - .gl-display-flex.gl-justify-content-end - = link_to(s_('ClusterIntegration|Clear cluster cache'), clusterable.clear_cluster_cache_path(@cluster), method: :delete, class: 'btn btn-primary') + = link_to(s_('ClusterIntegration|Clear cluster cache'), clusterable.clear_cluster_cache_path(@cluster), method: :delete, class: 'btn btn-primary') .sub-section.form-group %h4.text-danger diff --git a/app/views/clusters/clusters/_provider_details_form.html.haml b/app/views/clusters/clusters/_provider_details_form.html.haml index e211851b939..fcb5d4402d6 100644 --- a/app/views/clusters/clusters/_provider_details_form.html.haml +++ b/app/views/clusters/clusters/_provider_details_form.html.haml @@ -48,5 +48,5 @@ - if cluster.allow_user_defined_namespace? = render('clusters/clusters/namespace', platform_field: platform_field) - .form-group.gl-display-flex.gl-justify-content-end + .form-group = field.submit s_('ClusterIntegration|Save changes'), class: 'btn btn-success' |