diff --git a/config/feature_flags/gitlab_com_derisk/users_search_scoped_to_authorized_namespaces_basic_search.yml b/config/feature_flags/gitlab_com_derisk/users_search_scoped_to_authorized_namespaces_basic_search.yml deleted file mode 100644 index b7c9a64f6767531aa260ff8ef3d7282c093ad17c..0000000000000000000000000000000000000000 --- a/config/feature_flags/gitlab_com_derisk/users_search_scoped_to_authorized_namespaces_basic_search.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: users_search_scoped_to_authorized_namespaces_basic_search -feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/442091 -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/182557 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/520710 -milestone: '17.10' -group: group::global search -type: gitlab_com_derisk -default_enabled: false diff --git a/config/feature_flags/gitlab_com_derisk/users_search_scoped_to_authorized_namespaces_basic_search_by_ids.yml b/config/feature_flags/gitlab_com_derisk/users_search_scoped_to_authorized_namespaces_basic_search_by_ids.yml deleted file mode 100644 index fd4fbcbaa7c4006fc32393b13c4277ebab0d0ada..0000000000000000000000000000000000000000 --- a/config/feature_flags/gitlab_com_derisk/users_search_scoped_to_authorized_namespaces_basic_search_by_ids.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: users_search_scoped_to_authorized_namespaces_basic_search_by_ids -feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/442091 -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/182557 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/524297 -milestone: '17.10' -group: group::global search -type: gitlab_com_derisk -default_enabled: false diff --git a/doc/user/search/_index.md b/doc/user/search/_index.md index 65cd7db2085d685811af03738d3c593edbb8a9fa..fc164d7138b2f1e3102a8b8bd38df86f2aebbc70 100644 --- a/doc/user/search/_index.md +++ b/doc/user/search/_index.md @@ -128,7 +128,8 @@ However, the query matches all possible variations of the string (for example, ` {{< history >}} -- Showing only users from authorized projects and groups [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/442091) in GitLab 17.10 [with flags](../../administration/feature_flags.md) named `users_search_scoped_to_authorized_namespaces_advanced_search` and `users_search_scoped_to_authorized_namespaces_basic_search`. Disabled by default. +- Showing only users from authorized projects and groups [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/442091) in GitLab 17.10 [with flags](../../administration/feature_flags.md) named `users_search_scoped_to_authorized_namespaces_advanced_search`, `users_search_scoped_to_authorized_namespaces_basic_search`, and `users_search_scoped_to_authorized_namespaces_basic_search_by_ids`. Disabled by default. +- [Generally available](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/185577) in GitLab 17.11. Feature flags `users_search_scoped_to_authorized_namespaces_advanced_search`, `users_search_scoped_to_authorized_namespaces_basic_search`, and `users_search_scoped_to_authorized_namespaces_basic_search_by_ids` removed. {{< /history >}} diff --git a/lib/gitlab/search_results.rb b/lib/gitlab/search_results.rb index c795c12b157eb529fc81ff84405f9faf1eaee6f1..e80d34890c4d4b98171843dde06277a0eb404eed 100644 --- a/lib/gitlab/search_results.rb +++ b/lib/gitlab/search_results.rb @@ -112,12 +112,8 @@ def users params = { search: query, use_minimum_char_limit: false } if current_user && filters[:autocomplete] - if Feature.enabled?(:users_search_scoped_to_authorized_namespaces_basic_search, current_user) - params[:by_membership] = true - elsif Feature.enabled?(:users_search_scoped_to_authorized_namespaces_basic_search_by_ids, current_user) - params[:group_member_source_ids] = current_user_authorized_group_ids - params[:project_member_source_ids] = current_user_authorized_project_ids - end + params[:group_member_source_ids] = current_user_authorized_group_ids + params[:project_member_source_ids] = current_user_authorized_project_ids end UsersFinder.new(current_user, params).execute diff --git a/spec/lib/gitlab/search_results_spec.rb b/spec/lib/gitlab/search_results_spec.rb index 42971c087fc7f41d724117cf86eae117dbd01a73..4ea14c7751e41188df2e4496a7c14354192477b5 100644 --- a/spec/lib/gitlab/search_results_spec.rb +++ b/spec/lib/gitlab/search_results_spec.rb @@ -456,23 +456,7 @@ end end - context 'when users_search_scoped_to_authorized_namespaces_basic_search is enabled' do - before do - stub_feature_flags(users_search_scoped_to_authorized_namespaces_basic_search: true) - stub_feature_flags(users_search_scoped_to_authorized_namespaces_basic_search_by_ids: false) - end - - include_examples 'returns users' - end - - context 'when users_search_scoped_to_authorized_namespaces_basic_search_by_ids is enabled' do - before do - stub_feature_flags(users_search_scoped_to_authorized_namespaces_basic_search_by_ids: true) - stub_feature_flags(users_search_scoped_to_authorized_namespaces_basic_search: false) - end - - include_examples 'returns users' - end + include_examples 'returns users' end end end