Add latest changes from gitlab-org/gitlab@master

3 files changed, 8 insertions, 8 deletions

diff --git a/app/assets/javascripts/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue b/app/assets/javascripts/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue
index 4aee02e45c8..9d4eddc510a 100644
--- a/app/assets/javascripts/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue
+++ b/app/assets/javascripts/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue
@@ -293,7 +293,7 @@ export default {
         :items="roles"
         :loading="isLoadingRoles"
         :loading-text="s__('ClusterIntegration|Loading IAM Roles')"
-        :placeholder="s__('ClusterIntergation|Select service role')"
+        :placeholder="s__('ClusterIntegration|Select service role')"
         :search-field-placeholder="s__('ClusterIntegration|Search IAM Roles')"
         :empty-text="s__('ClusterIntegration|No IAM Roles found')"
         :has-errors="Boolean(loadingRolesError)"
@@ -330,7 +330,7 @@ export default {
         :disabled-text="s__('ClusterIntegration|Select a region to choose a Key Pair')"
         :loading="isLoadingKeyPairs"
         :loading-text="s__('ClusterIntegration|Loading Key Pairs')"
-        :placeholder="s__('ClusterIntergation|Select key pair')"
+        :placeholder="s__('ClusterIntegration|Select key pair')"
         :search-field-placeholder="s__('ClusterIntegration|Search Key Pairs')"
         :empty-text="s__('ClusterIntegration|No Key Pairs found')"
         :has-errors="Boolean(loadingKeyPairsError)"
@@ -359,7 +359,7 @@ export default {
         :disabled="vpcDropdownDisabled"
         :disabled-text="s__('ClusterIntegration|Select a region to choose a VPC')"
         :loading-text="s__('ClusterIntegration|Loading VPCs')"
-        :placeholder="s__('ClusterIntergation|Select a VPC')"
+        :placeholder="s__('ClusterIntegration|Select a VPC')"
         :search-field-placeholder="s__('ClusterIntegration|Search VPCs')"
         :empty-text="s__('ClusterIntegration|No VPCs found')"
         :has-errors="Boolean(loadingVpcsError)"
@@ -389,7 +389,7 @@ export default {
         :disabled="subnetDropdownDisabled"
         :disabled-text="s__('ClusterIntegration|Select a VPC to choose a subnet')"
         :loading-text="s__('ClusterIntegration|Loading subnets')"
-        :placeholder="s__('ClusterIntergation|Select a subnet')"
+        :placeholder="s__('ClusterIntegration|Select a subnet')"
         :search-field-placeholder="s__('ClusterIntegration|Search subnets')"
         :empty-text="s__('ClusterIntegration|No subnet found')"
         :has-errors="displaySubnetError"
@@ -420,7 +420,7 @@ export default {
         :disabled="securityGroupDropdownDisabled"
         :disabled-text="s__('ClusterIntegration|Select a VPC to choose a security group')"
         :loading-text="s__('ClusterIntegration|Loading security groups')"
-        :placeholder="s__('ClusterIntergation|Select a security group')"
+        :placeholder="s__('ClusterIntegration|Select a security group')"
         :search-field-placeholder="s__('ClusterIntegration|Search security groups')"
         :empty-text="s__('ClusterIntegration|No security group found')"
         :has-errors="Boolean(loadingSecurityGroupsError)"
@@ -451,7 +451,7 @@ export default {
         :items="instanceTypes"
         :loading="isLoadingInstanceTypes"
         :loading-text="s__('ClusterIntegration|Loading instance types')"
-        :placeholder="s__('ClusterIntergation|Select an instance type')"
+        :placeholder="s__('ClusterIntegration|Select an instance type')"
         :search-field-placeholder="s__('ClusterIntegration|Search instance types')"
         :empty-text="s__('ClusterIntegration|No instance type found')"
         :has-errors="Boolean(loadingInstanceTypesError)"
diff --git a/app/assets/javascripts/create_cluster/gke_cluster/components/gke_network_dropdown.vue b/app/assets/javascripts/create_cluster/gke_cluster/components/gke_network_dropdown.vue
index 12b6070a79a..8f18ac29c0f 100644
--- a/app/assets/javascripts/create_cluster/gke_cluster/components/gke_network_dropdown.vue
+++ b/app/assets/javascripts/create_cluster/gke_cluster/components/gke_network_dropdown.vue
@@ -43,7 +43,7 @@ export default {
     :loading="isLoadingItems"
     :has-errors="Boolean(loadingItemsError)"
     :loading-text="s__('ClusterIntegration|Loading networks')"
-    :placeholder="s__('ClusterIntergation|Select a network')"
+    :placeholder="s__('ClusterIntegration|Select a network')"
     :search-field-placeholder="s__('ClusterIntegration|Search networks')"
     :empty-text="s__('ClusterIntegration|No networks found')"
     :error-message="s__('ClusterIntegration|Could not load networks')"
diff --git a/app/assets/javascripts/create_cluster/gke_cluster/components/gke_subnetwork_dropdown.vue b/app/assets/javascripts/create_cluster/gke_cluster/components/gke_subnetwork_dropdown.vue
index ec7889e2907..dab4adc3789 100644
--- a/app/assets/javascripts/create_cluster/gke_cluster/components/gke_subnetwork_dropdown.vue
+++ b/app/assets/javascripts/create_cluster/gke_cluster/components/gke_subnetwork_dropdown.vue
@@ -34,7 +34,7 @@ export default {
     :loading="isLoadingItems"
     :has-errors="Boolean(loadingItemsError)"
     :loading-text="s__('ClusterIntegration|Loading subnetworks')"
-    :placeholder="s__('ClusterIntergation|Select a subnetwork')"
+    :placeholder="s__('ClusterIntegration|Select a subnetwork')"
     :search-field-placeholder="s__('ClusterIntegration|Search subnetworks')"
     :empty-text="s__('ClusterIntegration|No subnetworks found')"
     :error-message="s__('ClusterIntegration|Could not load subnetworks')"