From edaa33dee2ff2f7ea3fac488d41558eb5f86d68c Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 20 Jan 2022 09:16:11 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-7-stable-ee --- app/finders/groups_finder.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/finders/groups_finder.rb') diff --git a/app/finders/groups_finder.rb b/app/finders/groups_finder.rb index 7e3cdd79a4c..7cb3e7a5d7f 100644 --- a/app/finders/groups_finder.rb +++ b/app/finders/groups_finder.rb @@ -54,7 +54,7 @@ class GroupsFinder < UnionFinder groups = [] if current_user - if Feature.enabled?(:use_traversal_ids_groups_finder, default_enabled: :yaml) + if Feature.enabled?(:use_traversal_ids_groups_finder, current_user, default_enabled: :yaml) groups << current_user.authorized_groups.self_and_ancestors groups << current_user.groups.self_and_descendants else @@ -81,7 +81,7 @@ class GroupsFinder < UnionFinder .groups .where('members.access_level >= ?', params[:min_access_level]) - if Feature.enabled?(:use_traversal_ids_groups_finder, default_enabled: :yaml) + if Feature.enabled?(:use_traversal_ids_groups_finder, current_user, default_enabled: :yaml) groups.self_and_descendants else Gitlab::ObjectHierarchy -- cgit v1.2.3