diff --git a/ee/app/models/ee/project.rb b/ee/app/models/ee/project.rb index 5c8deff985cd969f31a7fa367e3a6a7b26c0ece8..1cd250b9ec2fdf8571298f080c464ee993f403dd 100644 --- a/ee/app/models/ee/project.rb +++ b/ee/app/models/ee/project.rb @@ -946,24 +946,14 @@ def after_import def use_zoekt? # TODO: rename to index_code_with_zoekt? # https://gitlab.com/gitlab-org/gitlab/-/issues/421613 - return false unless zoekt_indexable? ::Zoekt::IndexedNamespace.enabled_for_project?(self) end def search_code_with_zoekt? - return false unless zoekt_indexable? - ::Zoekt::IndexedNamespace.search_enabled_for_project?(self) end - def zoekt_indexable? - return true if self.public? && self.repository_access_level > ::ProjectFeature::PRIVATE - return true if ::Feature.enabled?(:zoekt_index_private_repositories) - - false - end - def elastic_namespace_ancestry namespace.elastic_namespace_ancestry + "p#{id}-" end diff --git a/ee/config/feature_flags/development/zoekt_index_private_repositories.yml b/ee/config/feature_flags/development/zoekt_index_private_repositories.yml deleted file mode 100644 index 61ead65fc724fb86bc23aa9c6dd476a24c821031..0000000000000000000000000000000000000000 --- a/ee/config/feature_flags/development/zoekt_index_private_repositories.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: zoekt_index_private_repositories -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/125511 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/417112 -milestone: '16.2' -type: development -group: group::global search -default_enabled: true diff --git a/ee/spec/models/concerns/zoekt/searchable_repository_spec.rb b/ee/spec/models/concerns/zoekt/searchable_repository_spec.rb index ef1c2b604c764dd38da6dbd7827d43751ee60941..be6889c3f33ec41ad0283baa503b998099a37152 100644 --- a/ee/spec/models/concerns/zoekt/searchable_repository_spec.rb +++ b/ee/spec/models/concerns/zoekt/searchable_repository_spec.rb @@ -25,12 +25,6 @@ expect(unindexed_repository.use_zoekt?).to eq(false) end - it 'is false for private projects when zoekt_index_private_repositories is disabled' do - stub_feature_flags(zoekt_index_private_repositories: false) - - expect(private_repository.use_zoekt?).to eq(false) - end - it 'is true for private projects with new indexer' do expect(private_repository.use_zoekt?).to eq(true) end