From e951adcae07423cd2168fdfc53f5677d63e16fc5 Mon Sep 17 00:00:00 2001
From: maddievn <mvanniekerk@gitlab.com>
Date: Tue, 11 Mar 2025 08:09:02 +0200
Subject: [PATCH] Remove
users_search_scoped_to_authorized_namespaces_advanced_search flag
Changelog: added
EE: true
---
...scoped_to_authorized_namespaces_advanced_search.yml | 9 ---------
ee/lib/elastic/latest/user_class_proxy.rb | 1 -
ee/spec/lib/elastic/latest/user_class_proxy_spec.rb | 10 ----------
3 files changed, 20 deletions(-)
delete mode 100644 ee/config/feature_flags/gitlab_com_derisk/users_search_scoped_to_authorized_namespaces_advanced_search.yml
diff --git a/ee/config/feature_flags/gitlab_com_derisk/users_search_scoped_to_authorized_namespaces_advanced_search.yml b/ee/config/feature_flags/gitlab_com_derisk/users_search_scoped_to_authorized_namespaces_advanced_search.yml
deleted file mode 100644
index bb2b39e515b9b..0000000000000
--- a/ee/config/feature_flags/gitlab_com_derisk/users_search_scoped_to_authorized_namespaces_advanced_search.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: users_search_scoped_to_authorized_namespaces_advanced_search
-feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/442091
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/182277
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/521581
-milestone: '17.10'
-group: group::global search
-type: gitlab_com_derisk
-default_enabled: false
diff --git a/ee/lib/elastic/latest/user_class_proxy.rb b/ee/lib/elastic/latest/user_class_proxy.rb
index 6b4129aedb50a..750b871bb6590 100644
--- a/ee/lib/elastic/latest/user_class_proxy.rb
+++ b/ee/lib/elastic/latest/user_class_proxy.rb
@@ -103,7 +103,6 @@ def current_user_authorization_filters(query_hash, options)
return query_hash unless user
return query_hash if options[:project_id].present? || options[:group_id].present?
return query_hash unless options[:autocomplete]
- return query_hash unless Feature.enabled?(:users_search_scoped_to_authorized_namespaces_advanced_search, user)
authorized_groups = ::Search::GroupsFinder.new(user: user).execute
group_authorized_traversal_ids = ::Namespaces::Traversal::TrieNode.build(authorized_groups.map(&:traversal_ids))
diff --git a/ee/spec/lib/elastic/latest/user_class_proxy_spec.rb b/ee/spec/lib/elastic/latest/user_class_proxy_spec.rb
index 192c7ff7c5b18..a02aded1e036d 100644
--- a/ee/spec/lib/elastic/latest/user_class_proxy_spec.rb
+++ b/ee/spec/lib/elastic/latest/user_class_proxy_spec.rb
@@ -371,16 +371,6 @@
expect(query_hash).to eq(original_query_hash)
end
end
-
- context 'when users_search_scoped_to_authorized_namespaces_advanced_search flag is disabled' do
- before do
- stub_feature_flags(users_search_scoped_to_authorized_namespaces_advanced_search: false)
- end
-
- it 'returns query_hash as is' do
- expect(query_hash).to eq(original_query_hash)
- end
- end
end
end
--
GitLab