From aee37a411631008326ff229989ce3abeba081319 Mon Sep 17 00:00:00 2001 From: maddievn Date: Thu, 20 Mar 2025 15:14:45 +0200 Subject: [PATCH 1/3] Remove user autocomplete feature flags Changelog: changed --- ...d_to_authorized_namespaces_basic_search.yml | 9 --------- ...thorized_namespaces_basic_search_by_ids.yml | 9 --------- lib/gitlab/search_results.rb | 8 ++------ spec/lib/gitlab/search_results_spec.rb | 18 +----------------- 4 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 config/feature_flags/gitlab_com_derisk/users_search_scoped_to_authorized_namespaces_basic_search.yml delete mode 100644 config/feature_flags/gitlab_com_derisk/users_search_scoped_to_authorized_namespaces_basic_search_by_ids.yml 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 b7c9a64f676753..00000000000000 --- 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 fd4fbcbaa7c400..00000000000000 --- 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/lib/gitlab/search_results.rb b/lib/gitlab/search_results.rb index c795c12b157eb5..e80d34890c4d4b 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 42971c087fc7f4..4ea14c7751e411 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 -- GitLab From 53756521bbba1fca974e3534cecc7f1de9c75ecb Mon Sep 17 00:00:00 2001 From: maddievn Date: Mon, 24 Mar 2025 09:57:18 +0200 Subject: [PATCH 2/3] Update documentation --- doc/user/search/_index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/user/search/_index.md b/doc/user/search/_index.md index 65cd7db2085d68..a34291a1b4ca21 100644 --- a/doc/user/search/_index.md +++ b/doc/user/search/_index.md @@ -129,6 +129,7 @@ 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. +- [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/442091) in GitLab 17.11. Feature flags `users_search_scoped_to_authorized_namespaces_advanced_search` and `users_search_scoped_to_authorized_namespaces_basic_search` removed. {{< /history >}} -- GitLab From e44c66e32ab038956afeb75f5caab5fe0067280d Mon Sep 17 00:00:00 2001 From: Madelein van Niekerk Date: Mon, 24 Mar 2025 13:05:53 +0200 Subject: [PATCH 3/3] Apply 2 suggestion(s) to 1 file(s) Co-authored-by: Ashraf Khamis --- doc/user/search/_index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/user/search/_index.md b/doc/user/search/_index.md index a34291a1b4ca21..fc164d7138b2f1 100644 --- a/doc/user/search/_index.md +++ b/doc/user/search/_index.md @@ -128,8 +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. -- [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/442091) in GitLab 17.11. Feature flags `users_search_scoped_to_authorized_namespaces_advanced_search` and `users_search_scoped_to_authorized_namespaces_basic_search` removed. +- 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 >}} -- GitLab