Add latest changes from gitlab-org/gitlab@master

3 files changed, 12 insertions, 1 deletions

diff --git a/app/assets/javascripts/import_entities/import_groups/components/import_table.vue b/app/assets/javascripts/import_entities/import_groups/components/import_table.vue
index cb7e3ef9632..e9559f735d6 100644
--- a/app/assets/javascripts/import_entities/import_groups/components/import_table.vue
+++ b/app/assets/javascripts/import_entities/import_groups/components/import_table.vue
@@ -53,6 +53,10 @@ export default {
       type: RegExp,
       required: true,
     },
+    groupUrlErrorMessage: {
+      type: String,
+      required: true,
+    },
   },
 
   data() {
@@ -261,6 +265,7 @@ export default {
                 :group="group"
                 :available-namespaces="availableNamespaces"
                 :group-path-regex="groupPathRegex"
+                :group-url-error-message="groupUrlErrorMessage"
                 @update-target-namespace="updateTargetNamespace(group.id, $event)"
                 @update-new-name="updateNewName(group.id, $event)"
                 @import-group="importGroups([group.id])"
diff --git a/app/assets/javascripts/import_entities/import_groups/components/import_table_row.vue b/app/assets/javascripts/import_entities/import_groups/components/import_table_row.vue
index 1c3ede769e0..96c1dd21821 100644
--- a/app/assets/javascripts/import_entities/import_groups/components/import_table_row.vue
+++ b/app/assets/javascripts/import_entities/import_groups/components/import_table_row.vue
@@ -44,6 +44,10 @@ export default {
       type: RegExp,
       required: true,
     },
+    groupUrlErrorMessage: {
+      type: String,
+      required: true,
+    },
   },
 
   apollo: {
@@ -200,7 +204,7 @@ export default {
           />
           <p v-if="isInvalid" class="gl-text-red-500 gl-m-0 gl-mt-2">
             <template v-if="!isNameValid">
-              {{ __('Please choose a group URL with no special characters.') }}
+              {{ groupUrlErrorMessage }}
             </template>
             <template v-else-if="invalidNameValidationMessage">
               {{ invalidNameValidationMessage }}
diff --git a/app/assets/javascripts/import_entities/import_groups/index.js b/app/assets/javascripts/import_entities/import_groups/index.js
index cc60c8cbdb0..07b839c5c82 100644
--- a/app/assets/javascripts/import_entities/import_groups/index.js
+++ b/app/assets/javascripts/import_entities/import_groups/index.js
@@ -17,6 +17,7 @@ export function mountImportGroupsApp(mountElement) {
     jobsPath,
     sourceUrl,
     groupPathRegex,
+    groupUrlErrorMessage,
   } = mountElement.dataset;
   const apolloProvider = new VueApollo({
     defaultClient: createApolloClient({
@@ -38,6 +39,7 @@ export function mountImportGroupsApp(mountElement) {
         props: {
           sourceUrl,
           groupPathRegex: new RegExp(`^(${groupPathRegex})$`),
+          groupUrlErrorMessage,
         },
       });
     },