diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-19 21:08:23 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-19 21:08:23 +0300 |
commit | 3f0db3db2ad99a74c3969bf2e930814004ccf1ec (patch) | |
tree | c8b4123b3b4b422b14211430b85556e64eb68a26 /app/finders | |
parent | 4a721269429a178957e8ce7c6d0a75d3307c9830 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/finders')
-rw-r--r-- | app/finders/members_finder.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/finders/members_finder.rb b/app/finders/members_finder.rb index 1ff2ad01b63..ea101cf1dcd 100644 --- a/app/finders/members_finder.rb +++ b/app/finders/members_finder.rb @@ -83,7 +83,10 @@ class MembersFinder union = Gitlab::SQL::Union.new(union_members, remove_duplicates: false) # rubocop: disable Gitlab/Union sql = distinct_on(union) - Member.includes(:user).from([Arel.sql("(#{sql}) AS #{Member.table_name}")]) # rubocop: disable CodeReuse/ActiveRecord + # enumerate the columns here since we are enumerating them in the union and want to be immune to + # column caching issues when adding/removing columns + Member.select(*Member.column_names) + .includes(:user).from([Arel.sql("(#{sql}) AS #{Member.table_name}")]) # rubocop: disable CodeReuse/ActiveRecord end def distinct_on(union) |