diff --git a/config/feature_flags/development/advanced_search_multi_project_select.yml b/config/feature_flags/development/advanced_search_multi_project_select.yml deleted file mode 100644 index 8f74c8990fa6fb6dcf56de630c3322734fbb5240..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/advanced_search_multi_project_select.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: advanced_search_multi_project_select -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62606 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/333011 -milestone: '14.4' -type: development -group: group::global search -default_enabled: false diff --git a/ee/app/services/ee/search_service.rb b/ee/app/services/ee/search_service.rb index ef2a691cc88ba48122d29cef98f2a43f83819f40..de21065815f196532809025fdd7bd3b9ff62c4ac 100644 --- a/ee/app/services/ee/search_service.rb +++ b/ee/app/services/ee/search_service.rb @@ -28,7 +28,6 @@ def search_type override :projects def projects return unless params[:project_ids].present? && params[:project_ids].is_a?(String) - return unless ::Feature.enabled?(:advanced_search_multi_project_select, current_user) project_ids = params[:project_ids].split(',') the_projects = ::Project.where(id: project_ids) diff --git a/ee/spec/services/search_service_spec.rb b/ee/spec/services/search_service_spec.rb index 1361886cdcfe6eff9b71fb464f7468d46ec43b1e..c86ae6a195c98f6bd21ae015b09a4157babab6b2 100644 --- a/ee/spec/services/search_service_spec.rb +++ b/ee/spec/services/search_service_spec.rb @@ -77,19 +77,6 @@ expect(projects).to be_nil end end - - context 'when the advanced_search_multi_project_select feature is not enabled' do - before do - stub_feature_flags(advanced_search_multi_project_select: false) - end - - it 'returns nil' do - project_ids = accessible_project.id.to_s - projects = described_class.new(user, project_ids: project_ids).projects - - expect(projects).to be_nil - end - end end describe '#use_elasticsearch?' do