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 bb2b39e515b9bbd45ffdd9f4d25876725de3b529..0000000000000000000000000000000000000000 --- 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 6b4129aedb50aaed40ffad027408c7561f25034e..750b871bb65905540334992908066a0b61dd0d42 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 192c7ff7c5b189565446097105cc567dca639462..a02aded1e036d366ddf9d1c6ffbb8cabd3e66dd9 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