diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2015-11-12 17:50:43 +0100 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2015-11-18 13:05:45 +0100 |
commit | bfd9855a2b2a09e8f5bff89e84891d3ad598fe0d (patch) | |
tree | ba3f29a02efdcf9dd398eb8c18478b84c0e15010 | |
parent | 189c40c33d18df08dd40e9f009f6658f89e3af0e (diff) | |
download | gitlab-ce-bfd9855a2b2a09e8f5bff89e84891d3ad598fe0d.tar.gz |
Prefix table names for User UNIONs
-rw-r--r-- | app/models/user.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index ddb3158e0f5..a2258967e27 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -396,13 +396,14 @@ class User < ActiveRecord::Base union = Gitlab::SQL::Union. new([groups.select(:id), authorized_projects.select(:namespace_id)]) - Group.where("id IN (#{union.to_sql})") + Group.where("namespaces.id IN (#{union.to_sql})") end end # Projects user has access to def authorized_projects - @authorized_projects ||= Project.where("id IN (#{projects_union.to_sql})") + @authorized_projects ||= + Project.where("projects.id IN (#{projects_union.to_sql})") end def owned_projects |