From f486b06c4de26e7eb6468cfc4f864b50e645d5c7 Mon Sep 17 00:00:00 2001 From: Yorick Peterse Date: Wed, 18 Nov 2015 15:08:28 +0100 Subject: Return internal projects in PersonalProjectsFinder When getting the projects of a user we should get the public _and_ internal projects, not just the public ones. --- app/finders/personal_projects_finder.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/finders/personal_projects_finder.rb b/app/finders/personal_projects_finder.rb index 7c039573614..a61ffa22990 100644 --- a/app/finders/personal_projects_finder.rb +++ b/app/finders/personal_projects_finder.rb @@ -26,7 +26,7 @@ class PersonalProjectsFinder authorized = @user.personal_projects.visible_to_user(current_user) union = Gitlab::SQL::Union. - new([authorized.select(:id), public_projects.select(:id)]) + new([authorized.select(:id), public_and_internal_projects.select(:id)]) Project.where("projects.id IN (#{union.to_sql})") end @@ -34,4 +34,8 @@ class PersonalProjectsFinder def public_projects @user.personal_projects.public_only end + + def public_and_internal_projects + @user.personal_projects.public_and_internal_only + end end -- cgit v1.2.1