Skip to content

G
gitlab-ce
Commit 0289a8fc authored by Alex Pooley's avatar Alex Pooley Committed by Dylan Griffith
Browse files
Options

GroupsFinder actor based FF

parent 7e079330
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
app/finders/groups_finder.rb
View file @ 0289a8fc
...@@ -54,7 +54,7 @@ class GroupsFinder < UnionFinder ...@@ -54,7 +54,7 @@ class GroupsFinder < UnionFinder
groups = [] groups = []
if current_user 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.authorized_groups.self_and_ancestors
groups << current_user.groups.self_and_descendants groups << current_user.groups.self_and_descendants
else else
...@@ -81,7 +81,7 @@ class GroupsFinder < UnionFinder ...@@ -81,7 +81,7 @@ class GroupsFinder < UnionFinder
.groups .groups
.where('members.access_level >= ?', params[:min_access_level]) .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 groups.self_and_descendants
else else
Gitlab::ObjectHierarchy Gitlab::ObjectHierarchy
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7