diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-31 06:09:26 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-31 06:09:26 +0300 |
| commit | 69d62eae981e12419891a050f5d6753941c9e42f (patch) | |
| tree | f6137b0fd312c7a9234a27b3ba0470884811a92b /app/models/member.rb | |
| parent | 22ed58450d4fd51446f0bad9c754ba5022550adf (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/member.rb')
| -rw-r--r-- | app/models/member.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/member.rb b/app/models/member.rb index e00f82614c6..bd5713bf378 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -65,10 +65,10 @@ class Member < ApplicationRecord scope :in_hierarchy, ->(source) do groups = source.root_ancestor.self_and_descendants - group_members = Member.default_scoped.where(source: groups) + group_members = Member.default_scoped.where(source: groups).select(*Member.cached_column_list) projects = source.root_ancestor.all_projects - project_members = Member.default_scoped.where(source: projects) + project_members = Member.default_scoped.where(source: projects).select(*Member.cached_column_list) Member.default_scoped.from_union([ group_members, |