Merge branch 'ce-5666-backport' into 'master'

CE port of "List groups with developer maintainer access on project creation"

See merge request gitlab-org/gitlab-ce!21051

2 files changed, 11 insertions, 6 deletions

diff --git a/app/helpers/namespaces_helper.rb b/app/helpers/namespaces_helper.rb
index 66aaf055cf2..30585cb403d 100644
--- a/app/helpers/namespaces_helper.rb
+++ b/app/helpers/namespaces_helper.rb
@@ -3,11 +3,10 @@ module NamespacesHelper
     params.dig(:project, :namespace_id) || params[:namespace_id]
   end
 
-  def namespaces_options(selected = :current_user, display_path: false, extra_group: nil, groups_only: false)
-    groups = current_user.manageable_groups
-               .joins(:route)
-               .includes(:route)
-               .order('routes.path')
+  def namespaces_options(selected = :current_user, display_path: false, groups: nil, extra_group: nil, groups_only: false)
+    groups ||= current_user.manageable_groups
+                 .eager_load(:route)
+                 .order('routes.path')
     users = [current_user.namespace]
     selected_id = selected
 
diff --git a/app/views/projects/_new_project_fields.html.haml b/app/views/projects/_new_project_fields.html.haml
index c78baa5dfe4..ad8c7911fad 100644
--- a/app/views/projects/_new_project_fields.html.haml
+++ b/app/views/projects/_new_project_fields.html.haml
@@ -12,7 +12,13 @@
         .input-group-prepend.has-tooltip{ title: root_url }
           .input-group-text
             = root_url
-        = f.select :namespace_id, namespaces_options(namespace_id_from(params) || :current_user, display_path: true, extra_group: namespace_id_from(params)), {}, { class: 'select2 js-select-namespace qa-project-namespace-select', tabindex: 1}
+        - namespace_id = namespace_id_from(params)
+        = f.select(:namespace_id,
+                   namespaces_options(namespace_id || :current_user,
+                                      display_path: true,
+                                      extra_group: namespace_id),
+                   {},
+                   { class: 'select2 js-select-namespace qa-project-namespace-select', tabindex: 1})
 
       - else
         .input-group-prepend.static-namespace.has-tooltip{ title: user_url(current_user.username) + '/' }