Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 8 deletions

diff --git a/app/assets/javascripts/groups/components/transfer_group_form.vue b/app/assets/javascripts/groups/components/transfer_group_form.vue
index fd3c4d5fc8a..e848f10352d 100644
--- a/app/assets/javascripts/groups/components/transfer_group_form.vue
+++ b/app/assets/javascripts/groups/components/transfer_group_form.vue
@@ -20,8 +20,8 @@ export default {
     NamespaceSelect,
   },
   props: {
-    parentGroups: {
-      type: Object,
+    groupNamespaces: {
+      type: Array,
       required: true,
     },
     isPaidGroup: {
@@ -60,7 +60,7 @@ export default {
     <gl-form-group v-if="!isPaidGroup">
       <namespace-select
         :default-text="$options.i18n.dropdownTitle"
-        :data="parentGroups"
+        :group-namespaces="groupNamespaces"
         :empty-namespace-title="$options.i18n.emptyNamespaceTitle"
         :include-headers="false"
         include-empty-namespace
diff --git a/app/assets/javascripts/groups/init_transfer_group_form.js b/app/assets/javascripts/groups/init_transfer_group_form.js
index baa4fab895f..f055b926918 100644
--- a/app/assets/javascripts/groups/init_transfer_group_form.js
+++ b/app/assets/javascripts/groups/init_transfer_group_form.js
@@ -5,15 +5,13 @@ import TransferGroupForm, { i18n } from './components/transfer_group_form.vue';
 
 const prepareGroups = (rawGroups) => {
   if (!rawGroups) {
-    return { group: [] };
+    return [];
   }
 
-  const group = JSON.parse(rawGroups).map(({ id, text: humanName }) => ({
+  return JSON.parse(rawGroups).map(({ id, text: humanName }) => ({
     id,
     humanName,
   }));
-
-  return { group };
 };
 
 export default () => {
@@ -38,7 +36,7 @@ export default () => {
     render(createElement) {
       return createElement(TransferGroupForm, {
         props: {
-          parentGroups: prepareGroups(parentGroups),
+          groupNamespaces: prepareGroups(parentGroups),
           isPaidGroup: parseBoolean(isPaidGroup),
           confirmButtonText,
           confirmationPhrase: groupName,