diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-02 12:09:49 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-02 12:09:49 +0300 |
commit | 157c4d9279f8ba1ad14debad9bdd017725bad316 (patch) | |
tree | 1a594f4a8a42c53fa0d55a65e067f133e387bce5 /app/models/concerns/loaded_in_group_list.rb | |
parent | e55fd66eae00abbfe53b24cf7f52f6ddfd0da8b1 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns/loaded_in_group_list.rb')
-rw-r--r-- | app/models/concerns/loaded_in_group_list.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/concerns/loaded_in_group_list.rb b/app/models/concerns/loaded_in_group_list.rb index 848ef63f1c2..98f6ad58434 100644 --- a/app/models/concerns/loaded_in_group_list.rb +++ b/app/models/concerns/loaded_in_group_list.rb @@ -41,9 +41,11 @@ module LoadedInGroupList namespaces = Namespace.arel_table children = namespaces.alias('children') + # TODO 6473: remove the filtering of the Namespaces::ProjectNamespace see https://gitlab.com/groups/gitlab-org/-/epics/6473 namespaces.project(Arel.star.count.as('preloaded_subgroup_count')) .from(children) .where(children[:parent_id].eq(namespaces[:id])) + .where(children[:type].is_distinct_from(Namespaces::ProjectNamespace.sti_name)) end def member_count_sql |