diff options
Diffstat (limited to 'app/finders/members_finder.rb')
| -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) |