Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

3 files changed, 36 insertions, 20 deletions

diff --git a/app/assets/javascripts/clusters/components/fluentd_output_settings.vue b/app/assets/javascripts/clusters/components/fluentd_output_settings.vue
index 369cb2fa0f3..aaad0009ef3 100644
--- a/app/assets/javascripts/clusters/components/fluentd_output_settings.vue
+++ b/app/assets/javascripts/clusters/components/fluentd_output_settings.vue
@@ -54,15 +54,17 @@ export default {
       required: false,
     },
   },
-  data: () => ({
-    currentServerSideSettings: {
-      host: null,
-      port: null,
-      protocol: null,
-      wafLogEnabled: null,
-      ciliumLogEnabled: null,
-    },
-  }),
+  data() {
+    return {
+      currentServerSideSettings: {
+        host: null,
+        port: null,
+        protocol: null,
+        wafLogEnabled: null,
+        ciliumLogEnabled: null,
+      },
+    };
+  },
   computed: {
     isSaving() {
       return [UPDATING].includes(this.status);
diff --git a/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue b/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue
index 26767c32275..1ba28660e5c 100644
--- a/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue
+++ b/app/assets/javascripts/clusters/components/ingress_modsecurity_settings.vue
@@ -18,6 +18,9 @@ import { s__, __ } from '../../locale';
 const { UPDATING, UNINSTALLING, INSTALLING, INSTALLED, UPDATED } = APPLICATION_STATUS;
 
 export default {
+  i18n: {
+    modSecurityEnabled: s__('ClusterIntegration|ModSecurity enabled'),
+  },
   title: __('Web Application Firewall'),
   modsecurityUrl: 'https://modsecurity.org/about.html',
   components: {
@@ -53,11 +56,13 @@ export default {
       }),
     },
   },
-  data: () => ({
-    modSecurityLogo,
-    initialValue: null,
-    initialMode: null,
-  }),
+  data() {
+    return {
+      modSecurityLogo,
+      initialValue: null,
+      initialMode: null,
+    };
+  },
   computed: {
     modSecurityEnabled: {
       get() {
@@ -200,7 +205,12 @@ export default {
             </strong>
           </p>
           <div class="form-check form-check-inline mt-3">
-            <gl-toggle v-model="modSecurityEnabled" :disabled="saveButtonDisabled" />
+            <gl-toggle
+              v-model="modSecurityEnabled"
+              :disabled="saveButtonDisabled"
+              :label="$options.i18n.modSecurityEnabled"
+              label-position="hidden"
+            />
           </div>
           <div
             v-if="ingress.modsecurity_enabled"
diff --git a/app/assets/javascripts/clusters/forms/components/integration_form.vue b/app/assets/javascripts/clusters/forms/components/integration_form.vue
index f0dafa7ef53..a344f9578fd 100644
--- a/app/assets/javascripts/clusters/forms/components/integration_form.vue
+++ b/app/assets/javascripts/clusters/forms/components/integration_form.vue
@@ -9,8 +9,14 @@ import {
   GlButton,
 } from '@gitlab/ui';
 import { mapState } from 'vuex';
+import { s__ } from '~/locale';
 
 export default {
+  i18n: {
+    toggleLabel: s__(
+      "ClusterIntegration|Enable or disable GitLab's connection to your Kubernetes cluster.",
+    ),
+  },
   components: {
     GlFormGroup,
     GlToggle,
@@ -79,11 +85,9 @@ export default {
             data-qa-selector="integration_status_toggle"
             aria-describedby="toggleCluster"
             :disabled="!editable"
-            :title="
-              s__(
-                'ClusterIntegration|Enable or disable GitLab\'s connection to your Kubernetes cluster.',
-              )
-            "
+            :label="$options.i18n.toggleLabel"
+            label-position="hidden"
+            :title="$options.i18n.toggleLabel"
           />
         </div>
       </div>