diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 12:07:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 12:07:48 +0300 |
| commit | 5bd24a54ef4ce3a38a860eb53b66d062c2382971 (patch) | |
| tree | 5f5e65571dfcb2c62c27600ee7655dec4b44c923 /app/finders/groups_finder.rb | |
| parent | 74673d04d25ffed35cbcf17cd42969bed0a4e705 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/finders/groups_finder.rb')
| -rw-r--r-- | app/finders/groups_finder.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/finders/groups_finder.rb b/app/finders/groups_finder.rb index 7d419103b1c..54715557399 100644 --- a/app/finders/groups_finder.rb +++ b/app/finders/groups_finder.rb @@ -45,7 +45,7 @@ class GroupsFinder < UnionFinder def all_groups return [owned_groups] if params[:owned] return [groups_with_min_access_level] if min_access_level? - return [Group.all] if current_user&.full_private_access? && all_available? + return [Group.all] if current_user&.can_read_all_resources? && all_available? groups = [] groups << Gitlab::ObjectHierarchy.new(groups_for_ancestors, groups_for_descendants).all_objects if current_user |