diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2015-11-20 17:48:05 +0300 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2015-11-20 17:53:04 +0300 |
commit | fed059a12ddde628a7d19d008c199da00990ce19 (patch) | |
tree | 8ab0358443b6b258efda7905554e6aadb78be243 /app/finders | |
parent | ba4dc176f812d8616657354778023c76f587f783 (diff) |
Port GitLab EE ProjectsFinder changes
These changes were added in GitLab EE commit
d39de0ea91b26b8840195e5674b92c353cc16661. The tests were a bit bugged
(they used a non existing group, thus not testing a crucial part) which
I only noticed when porting CE changes to EE.
Diffstat (limited to 'app/finders')
-rw-r--r-- | app/finders/projects_finder.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/finders/projects_finder.rb b/app/finders/projects_finder.rb index dd35c215c50..3b4e0362e04 100644 --- a/app/finders/projects_finder.rb +++ b/app/finders/projects_finder.rb @@ -23,17 +23,17 @@ class ProjectsFinder group = options[:group] if group - base, extra = group_projects(current_user, group) + segments = group_projects(current_user, group) else - base, extra = all_projects(current_user) + segments = all_projects(current_user) end - if base and extra - union = Gitlab::SQL::Union.new([base.select(:id), extra.select(:id)]) + if segments.length > 1 + union = Gitlab::SQL::Union.new(segments.map { |s| s.select(:id) }) Project.where("projects.id IN (#{union.to_sql})") else - base + segments.first end end |