Skip to content
Snippets Groups Projects
Commit 3b671807 authored by Arturo Herrero's avatar Arturo Herrero
Browse files

Remove use_traversal_ids_groups_finder feature flag

Changelog: other
parent 7d96e9e5
No related branches found
No related tags found
2 merge requests!123502Remove use_traversal_ids_groups_finder feature flag,!119439Draft: Prevent file variable content expansion in downstream pipeline
......@@ -72,17 +72,10 @@ def groups_for_descendants
# rubocop: disable CodeReuse/ActiveRecord
def groups_with_min_access_level
groups = current_user
current_user
.groups
.where('members.access_level >= ?', params[:min_access_level])
if Feature.enabled?(:use_traversal_ids_groups_finder, current_user)
groups.self_and_descendants
else
Gitlab::ObjectHierarchy
.new(groups)
.base_and_descendants
end
.self_and_descendants
end
# rubocop: enable CodeReuse/ActiveRecord
......@@ -145,20 +138,13 @@ def include_ancestors?
def get_groups_for_user
groups = []
if Feature.enabled?(:use_traversal_ids_groups_finder, current_user)
groups << if include_ancestors?
current_user.authorized_groups.self_and_ancestors
else
current_user.authorized_groups
end
groups << if include_ancestors?
current_user.authorized_groups.self_and_ancestors
else
current_user.authorized_groups
end
groups << current_user.groups.self_and_descendants
elsif include_ancestors?
groups << Gitlab::ObjectHierarchy.new(groups_for_ancestors, groups_for_descendants).all_objects
else
groups << current_user.authorized_groups
groups << Gitlab::ObjectHierarchy.new(groups_for_descendants).base_and_descendants
end
groups << current_user.groups.self_and_descendants
groups
end
......
---
name: use_traversal_ids_groups_finder
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67650
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345666
milestone: '14.6'
type: development
group: group::tenant scale
default_enabled: true
......@@ -2,10 +2,10 @@
require 'spec_helper'
RSpec.describe GroupsFinder do
RSpec.describe GroupsFinder, feature_category: :groups_and_projects do
include AdminModeHelper
shared_examples '#execute' do
describe '#execute' do
let(:user) { create(:user) }
describe 'root level groups' do
......@@ -376,16 +376,4 @@
end
end
end
describe '#execute' do
include_examples '#execute'
context 'when use_traversal_ids_groups_finder feature flags is disabled' do
before do
stub_feature_flags(use_traversal_ids_groups_finder: false)
end
include_examples '#execute'
end
end
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment