From 0a7f7161198feaa9a4cae7c16669a0e6187aed33 Mon Sep 17 00:00:00 2001 From: Felipe Artur Date: Thu, 17 Mar 2016 19:42:46 -0300 Subject: Code fixes --- app/finders/joined_groups_finder.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/finders/joined_groups_finder.rb') diff --git a/app/finders/joined_groups_finder.rb b/app/finders/joined_groups_finder.rb index ff744689e3d..867eb661682 100644 --- a/app/finders/joined_groups_finder.rb +++ b/app/finders/joined_groups_finder.rb @@ -12,7 +12,7 @@ class JoinedGroupsFinder # # Returns an ActiveRecord::Relation. def execute(current_user = nil) - if current_user && !current_user.external? + if current_user relation = groups_visible_to_user(current_user) else relation = public_groups @@ -29,7 +29,7 @@ class JoinedGroupsFinder # "@user" that "current_user" also has access to. def groups_visible_to_user(current_user) base = @user.authorized_groups.visible_to_user(current_user) - extra = public_and_internal_groups + extra = current_user.external? ? public_groups : public_and_internal_groups union = Gitlab::SQL::Union.new([base.select(:id), extra.select(:id)]) Group.where("namespaces.id IN (#{union.to_sql})") -- cgit v1.2.3