Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 8 deletions

diff --git a/app/assets/javascripts/projects/new/components/new_project_url_select.vue b/app/assets/javascripts/projects/new/components/new_project_url_select.vue
index e6a02a0d67d..eccfb3d844c 100644
--- a/app/assets/javascripts/projects/new/components/new_project_url_select.vue
+++ b/app/assets/javascripts/projects/new/components/new_project_url_select.vue
@@ -57,10 +57,7 @@ export default {
             id: this.namespaceId,
             fullPath: this.namespaceFullPath,
           }
-        : {
-            id: undefined,
-            fullPath: s__('ProjectsNew|Pick a group or namespace'),
-          },
+        : this.$options.emptyNameSpace,
       shouldSkipQuery: true,
       userNamespaceId: this.userNamespaceId,
     };
@@ -120,12 +117,18 @@ export default {
       this.setNamespace({ id, fullPath });
     },
     setNamespace({ id, fullPath }) {
-      this.selectedNamespace = {
-        id: getIdFromGraphQLId(id),
-        fullPath,
-      };
+      this.selectedNamespace = id
+        ? {
+            id: getIdFromGraphQLId(id),
+            fullPath,
+          }
+        : this.$options.emptyNameSpace;
     },
   },
+  emptyNameSpace: {
+    id: undefined,
+    fullPath: s__('ProjectsNew|Pick a group or namespace'),
+  },
 };
 </script>
 
diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js
index 186946a83ad..fe84660422b 100644
--- a/app/assets/javascripts/projects/project_new.js
+++ b/app/assets/javascripts/projects/project_new.js
@@ -342,6 +342,7 @@ const bindEvents = () => {
 
 export default {
   bindEvents,
+  validateGroupNamespaceDropdown,
   deriveProjectPathFromUrl,
   onProjectNameChange,
   onProjectPathChange,