diff options
| author | Imre Farkas <ifarkas@gitlab.com> | 2018-08-06 17:00:51 +0200 |
|---|---|---|
| committer | Imre Farkas <ifarkas@gitlab.com> | 2018-08-07 10:37:21 +0200 |
| commit | b06eb8c85d4fa00f5f530b5d74b3284c390ee99a (patch) | |
| tree | b4bab979c758a5fc34a5442aceec6b4eea24dac0 /app/helpers/namespaces_helper.rb | |
| parent | b211f7c25307971f97646b59e56cede47380c9d6 (diff) | |
| download | gitlab-ce-b06eb8c85d4fa00f5f530b5d74b3284c390ee99a.tar.gz | |
CE port of "List groups with developer maintainer access on project creation"
Diffstat (limited to 'app/helpers/namespaces_helper.rb')
| -rw-r--r-- | app/helpers/namespaces_helper.rb | 9 |
1 files changed, 4 insertions, 5 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 |