summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatija Čupić <matteeyah@gmail.com>2017-12-21 18:24:38 +0100
committerMatija Čupić <matteeyah@gmail.com>2017-12-21 18:24:38 +0100
commitfea009bfdacad62f03d0cf3ea02d54ec9989390c (patch)
tree84e8cb0d194215eab0ad769ddeb885929f8e32fc
parent9e2febf82fa63ff07e513cd400c7a41e4a4fe4bf (diff)
downloadgitlab-ce-fea009bfdacad62f03d0cf3ea02d54ec9989390c.tar.gz
Rename enabled partial to integration_form
-rw-r--r--app/views/projects/clusters/_banner.html.haml3
-rw-r--r--app/views/projects/clusters/_integration_form.html.haml (renamed from app/views/projects/clusters/_enabled.html.haml)0
-rw-r--r--app/views/projects/clusters/show.html.haml2
3 files changed, 3 insertions, 2 deletions
diff --git a/app/views/projects/clusters/_banner.html.haml b/app/views/projects/clusters/_banner.html.haml
index 6b9507c854f..26ca3307a4a 100644
--- a/app/views/projects/clusters/_banner.html.haml
+++ b/app/views/projects/clusters/_banner.html.haml
@@ -1,5 +1,4 @@
%h4= s_('ClusterIntegration|Cluster integration')
-%p= s_('ClusterIntegration|Control how your cluster integrates with GitLab')
.settings-content
.hidden.js-cluster-error.alert.alert-danger.alert-block.append-bottom-10{ role: 'alert' }
@@ -11,3 +10,5 @@
.hidden.js-cluster-success.alert.alert-success.alert-block.append-bottom-10{ role: 'alert' }
= s_('ClusterIntegration|Cluster was successfully created on Google Kubernetes Engine. Refresh the page to see cluster\'s details')
+
+ %p= s_('ClusterIntegration|Control how your cluster integrates with GitLab')
diff --git a/app/views/projects/clusters/_enabled.html.haml b/app/views/projects/clusters/_integration_form.html.haml
index 1eac2c9dc1f..1eac2c9dc1f 100644
--- a/app/views/projects/clusters/_enabled.html.haml
+++ b/app/views/projects/clusters/_integration_form.html.haml
diff --git a/app/views/projects/clusters/show.html.haml b/app/views/projects/clusters/show.html.haml
index dfaef8716de..c15785806b9 100644
--- a/app/views/projects/clusters/show.html.haml
+++ b/app/views/projects/clusters/show.html.haml
@@ -19,7 +19,7 @@
%section.settings.no-animate.expanded#cluster-integration
= render 'banner'
- = render 'enabled'
+ = render 'integration_form'
.cluster-applications-table#js-cluster-applications