diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-25 09:08:38 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-25 09:08:38 +0300 |
| commit | 0ebaa8a2fd43938cee0d2074f84cdfd10f1e23d1 (patch) | |
| tree | f9833e52906e746225f206e7e812d4ee7bc010f8 /app/assets/javascripts/clusters | |
| parent | 6c577c9ada5398fc44bc7a040a655b7a788eb0c9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/clusters')
| -rw-r--r-- | app/assets/javascripts/clusters/components/application_row.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/clusters/components/applications.vue | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/clusters/components/application_row.vue b/app/assets/javascripts/clusters/components/application_row.vue index 53bc079a4e1..dcc0fa501a3 100644 --- a/app/assets/javascripts/clusters/components/application_row.vue +++ b/app/assets/javascripts/clusters/components/application_row.vue @@ -322,7 +322,7 @@ export default { ></span> <slot name="description"></slot> <div v-if="hasError" class="cluster-application-error text-danger prepend-top-10"> - <p class="js-cluster-application-general-error-message append-bottom-0"> + <p class="js-cluster-application-general-error-message gl-mb-0"> {{ generalErrorDescription }} </p> <ul v-if="statusReason || requestReason"> diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue index f11502a7dde..71d0563ac7e 100644 --- a/app/assets/javascripts/clusters/components/applications.vue +++ b/app/assets/javascripts/clusters/components/applications.vue @@ -272,7 +272,7 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity <template> <section id="cluster-applications"> - <p class="append-bottom-0"> + <p class="gl-mb-0"> {{ s__(`ClusterIntegration|Choose which applications to install on your Kubernetes cluster. Helm Tiller is required to install any of the following applications.`) @@ -614,7 +614,7 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity > <div slot="description"> <span v-if="!rbac"> - <p v-if="!rbac" class="rbac-notice bs-callout bs-callout-info append-bottom-0"> + <p v-if="!rbac" class="rbac-notice bs-callout bs-callout-info gl-mb-0"> {{ s__(`ClusterIntegration|You must have an RBAC-enabled cluster to install Knative.`) |