Merge branch '207322-remove-redundant-slots' into 'master'

Refactor redundant divs on Kubernetes apps page

See merge request gitlab-org/gitlab!33452

app/assets/javascripts/clusters/components/application_row.vue

@@ -339,7 +339,9 @@ export default {
           class="js-cluster-application-installed-via"
           v-html="installedVia"
         ></span>
+        <div>
           <slot name="description"></slot>
+        </div>
         <div v-if="hasError" class="cluster-application-error text-danger prepend-top-10">
           <p class="js-cluster-application-general-error-message gl-mb-0">
             {{ generalErrorDescription }}

app/assets/javascripts/clusters/components/applications.vue

@@ -218,14 +218,12 @@ export default {
         title-link="https://docs.helm.sh/"
       >
         <template #description>
-          <div>
           {{
             s__(`ClusterIntegration|Helm streamlines installing
                     and managing Kubernetes applications.
                     Tiller runs inside of your Kubernetes Cluster,
                     and manages releases of your charts.`)
           }}
-          </div>
         </template>
       </application-row>
       <div v-show="!helmInstalled" class="cluster-application-warning">
@@ -257,7 +255,6 @@ export default {
         title-link="https://kubernetes.io/docs/concepts/services-networking/ingress/"
       >
         <template #description>
-          <div>
           <p>
             {{
               s__(`ClusterIntegration|Ingress gives you a way to route
@@ -273,9 +270,7 @@ export default {
 
           <template v-if="ingressInstalled">
             <div class="form-group">
-                <label for="ingress-endpoint">{{
-                  s__('ClusterIntegration|Ingress Endpoint')
-                }}</label>
+              <label for="ingress-endpoint">{{ s__('ClusterIntegration|Ingress Endpoint') }}</label>
               <div class="input-group">
                 <template v-if="ingressExternalEndpoint">
                   <input
@@ -342,7 +337,6 @@ export default {
               </strong>
             </div>
           </template>
-          </div>
         </template>
       </application-row>
       <application-row
@@ -363,7 +357,6 @@ export default {
         title-link="https://cert-manager.readthedocs.io/en/latest/#"
       >
         <template #description>
-          <div>
           <p>
             <gl-sprintf
               :message="
@@ -404,7 +397,6 @@ export default {
               >
             </p>
           </div>
-          </div>
         </template>
       </application-row>
       <application-row
@@ -463,14 +455,12 @@ export default {
         title-link="https://docs.gitlab.com/runner/"
       >
         <template #description>
-          <div>
           {{
             s__(`ClusterIntegration|GitLab Runner connects to the
                     repository and executes CI/CD jobs,
                     pushing results back and deploying
                     applications to production.`)
           }}
-          </div>
         </template>
       </application-row>
       <application-row
@@ -491,7 +481,6 @@ export default {
         title-link="https://crossplane.io"
       >
         <template #description>
-          <div>
           <p>
             <gl-sprintf
               :message="
@@ -516,7 +505,6 @@ export default {
           <div class="form-group">
             <CrossplaneProviderStack :crossplane="crossplane" @set="setCrossplaneProviderStack" />
           </div>
-          </div>
         </template>
       </application-row>
 
@@ -538,7 +526,6 @@ export default {
         title-link="https://jupyterhub.readthedocs.io/en/stable/"
       >
         <template #description>
-          <div>
           <p>
             {{
               s__(`ClusterIntegration|JupyterHub, a multi-user Hub, spawns,
@@ -551,9 +538,7 @@ export default {
 
           <template v-if="ingressExternalEndpoint">
             <div class="form-group">
-                <label for="jupyter-hostname">{{
-                  s__('ClusterIntegration|Jupyter Hostname')
-                }}</label>
+              <label for="jupyter-hostname">{{ s__('ClusterIntegration|Jupyter Hostname') }}</label>
 
               <div class="input-group">
                 <input
@@ -583,7 +568,6 @@ export default {
               </p>
             </div>
           </template>
-          </div>
         </template>
       </application-row>
       <application-row
@@ -610,7 +594,6 @@ export default {
         title-link="https://github.com/knative/docs"
       >
         <template #description>
-          <div>
           <p v-if="!rbac" class="rbac-notice bs-callout bs-callout-info">
             {{
               s__(`ClusterIntegration|You must have an RBAC-enabled cluster
@@ -634,7 +617,6 @@ export default {
             @save="saveKnativeDomain"
             @set="setKnativeDomain"
           />
-          </div>
         </template>
       </application-row>
       <application-row
@@ -659,7 +641,6 @@ export default {
         title-link="https://gitlab.com/gitlab-org/charts/elastic-stack"
       >
         <template #description>
-          <div>
           <p>
             {{
               s__(
@@ -667,7 +648,6 @@ export default {
               )
             }}
           </p>
-          </div>
         </template>
       </application-row>
 
@@ -696,7 +676,6 @@ export default {
         title-link="https://github.com/helm/charts/tree/master/stable/fluentd"
       >
         <template #description>
-          <div>
           <p>
             {{
               s__(
@@ -714,7 +693,6 @@ export default {
             :status="applications.fluentd.status"
             :update-failed="applications.fluentd.updateFailed"
           />
-          </div>
         </template>
       </application-row>
     </div>