Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 4 deletions

diff --git a/app/assets/javascripts/groups/components/transfer_group_form.vue b/app/assets/javascripts/groups/components/transfer_group_form.vue
index ba8de2b0203..2d0d6b41c99 100644
--- a/app/assets/javascripts/groups/components/transfer_group_form.vue
+++ b/app/assets/javascripts/groups/components/transfer_group_form.vue
@@ -43,9 +43,6 @@ export default {
     };
   },
   computed: {
-    selectedNamespaceId() {
-      return this.selectedId;
-    },
     disableSubmitButton() {
       return this.isPaidGroup || !this.selectedId;
     },
diff --git a/app/assets/javascripts/groups/init_transfer_group_form.js b/app/assets/javascripts/groups/init_transfer_group_form.js
index c60255e6ec3..c9a1e46de72 100644
--- a/app/assets/javascripts/groups/init_transfer_group_form.js
+++ b/app/assets/javascripts/groups/init_transfer_group_form.js
@@ -4,6 +4,10 @@ import { parseBoolean } from '~/lib/utils/common_utils';
 import TransferGroupForm, { i18n } from './components/transfer_group_form.vue';
 
 const prepareGroups = (rawGroups) => {
+  if (!rawGroups) {
+    return { group: [] };
+  }
+
   const group = JSON.parse(rawGroups).map(({ id, text: humanName }) => ({
     id,
     humanName,
@@ -22,7 +26,7 @@ export default () => {
     targetFormId = null,
     buttonText: confirmButtonText = '',
     groupName = '',
-    parentGroups = [],
+    parentGroups,
     isPaidGroup,
   } = el.dataset;