diff --git a/config/feature_flags/development/search_index_all_projects.yml b/config/feature_flags/development/search_index_all_projects.yml
index dc4ea2a175daf3506dc574361fb664e39ebcabc1..ad81dde6f6e262075c0e3c0213e486216738daca 100644
--- a/config/feature_flags/development/search_index_all_projects.yml
+++ b/config/feature_flags/development/search_index_all_projects.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432489
milestone: '16.7'
type: development
group: group::global search
-default_enabled: false
+default_enabled: true
diff --git a/doc/integration/advanced_search/elasticsearch.md b/doc/integration/advanced_search/elasticsearch.md
index 6618825ba9590c3d059d2c9868b75de6f350e1e0..59dce3c162673a8ae57121e294efcb6067b836c2 100644
--- a/doc/integration/advanced_search/elasticsearch.md
+++ b/doc/integration/advanced_search/elasticsearch.md
@@ -250,7 +250,7 @@ The following Elasticsearch settings are available:
| `Username` | The `username` of your Elasticsearch instance. |
| `Password` | The password of your Elasticsearch instance. |
| `Number of Elasticsearch shards and replicas per index` | Elasticsearch indices are split into multiple shards for performance reasons. In general, you should use at least five shards. Indices with tens of millions of documents should have more shards ([see the guidance](#guidance-on-choosing-optimal-cluster-configuration)). Changes to this value do not take effect until you re-create the index. For more information about scalability and resilience, see the [Elasticsearch documentation](https://www.elastic.co/guide/en/elasticsearch/reference/current/scalability.html). Each Elasticsearch shard can have a number of replicas. These replicas are a complete copy of the shard and can provide increased query performance or resilience against hardware failure. Increasing this value increases the total disk space required by the index. You can set the number of shards and replicas for each of the indices. |
-| `Limit the number of namespaces and projects that can be indexed` | Enabling this allows you to select namespaces and projects to index. All other namespaces and projects use database search instead. If you enable this option but do not select any namespaces or projects, none are indexed. [Read more below](#limit-the-number-of-namespaces-and-projects-that-can-be-indexed).|
+| `Limit the amount of namespace and project data to index` | When you enable this setting, you can specify namespaces and projects to index. All other namespaces and projects use database search instead. If you enable this setting but do not specify any namespace or project, [only project records are indexed](#all-project-records-are-indexed). For more information, see [Limit the amount of namespace and project data to index](#limit-the-amount-of-namespace-and-project-data-to-index). |
| `Using AWS OpenSearch Service with IAM credentials` | Sign your OpenSearch requests using [AWS IAM authorization](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_access-keys.html), [AWS EC2 Instance Profile Credentials](https://docs.aws.amazon.com/codedeploy/latest/userguide/getting-started-create-iam-instance-profile.html#getting-started-create-iam-instance-profile-cli), or [AWS ECS Tasks Credentials](https://docs.aws.amazon.com/AmazonECS/latest/userguide/task-iam-roles.html). Refer to [Identity and Access Management in Amazon OpenSearch Service](https://docs.aws.amazon.com/opensearch-service/latest/developerguide/ac.html) for details of AWS hosted OpenSearch domain access policy configuration. |
| `AWS Region` | The AWS region in which your OpenSearch Service is located. |
| `AWS Access Key` | The AWS access key. |
@@ -376,22 +376,15 @@ The following permissions are required for advanced search. See [Creating roles]
The index pattern `*` requires a few permissions for advanced search to work.
-### Limit the number of namespaces and projects that can be indexed
+### Limit the amount of namespace and project data to index
-When you select the **Limit the number of namespaces and projects that can be indexed**
+When you select the **Limit the amount of namespace and project data to index**
checkbox, you can specify namespaces and projects to index. If the namespace is a group,
any subgroups and projects belonging to those subgroups are also indexed.
-
-
Advanced search only provides cross-group code/commit search (global) if all name-spaces are indexed. In this particular scenario where only a subset of namespaces are indexed, a global search does not provide a code or commit scope. This is possible only in the scope of an indexed namespace. There is no way to code/commit search in multiple indexed namespaces (when only a subset of namespaces has been indexed). For example if two groups are indexed, there is no way to run a single code search on both. You can only run a code search on the first group and then on the second.
-You can filter the selection dropdown list by writing part of the namespace or project name you're interested in.
-
-
-
-NOTE:
-If no namespaces or projects are selected, no advanced search indexing takes place.
+If you do not specify any namespace or project, [only project records are indexed](#all-project-records-are-indexed).
WARNING:
If you have already indexed your instance, you must regenerate the index to delete all existing data
@@ -399,6 +392,24 @@ for filtering to work correctly. To do this, run the Rake tasks `gitlab:elastic:
`gitlab:elastic:clear_index_status`. Afterwards, removing a namespace or a project from the list deletes the data
from the Elasticsearch index as expected.
+#### All project records are indexed
+
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/428070) in GitLab 16.7 [with a flag](../../administration/feature_flags.md) named `search_index_all_projects`. Disabled by default.
+> - [Enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/432489) in GitLab 16.9.
+> - [Enabled on self-managed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/145300) in GitLab 16.10.
+
+FLAG:
+On self-managed GitLab, by default this feature is available.
+To hide the feature, an administrator can [disable the feature flag](../../administration/feature_flags.md) named `search_index_all_projects`.
+On GitLab.com, this feature is available.
+
+When you select the **Limit the amount of namespace and project data to index** checkbox:
+
+- All project records are indexed.
+- Associated data (issues, merge requests, or code) is not indexed.
+
+If you do not specify any namespace or project, only project records are indexed.
+
## Enable custom language analyzers
You can improve the language support for Chinese and Japanese languages by utilizing [`smartcn`](https://www.elastic.co/guide/en/elasticsearch/plugins/current/analysis-smartcn.html) and/or [`kuromoji`](https://www.elastic.co/guide/en/elasticsearch/plugins/current/analysis-kuromoji.html) analysis plugins from Elastic.
diff --git a/doc/integration/advanced_search/elasticsearch_troubleshooting.md b/doc/integration/advanced_search/elasticsearch_troubleshooting.md
index 61ab32d5ab1eaf2f03c4b2bf4d5b56ce5fcbe980..e206c6f7928a8104207c1c1204e0146e183007bf 100644
--- a/doc/integration/advanced_search/elasticsearch_troubleshooting.md
+++ b/doc/integration/advanced_search/elasticsearch_troubleshooting.md
@@ -219,7 +219,7 @@ If the results:
- Do not match up, this indicates a problem with the documents generated from the project. It is best to [re-index that project](../advanced_search/elasticsearch.md#indexing-a-range-of-projects-or-a-specific-project).
NOTE:
-The above instructions are not to be used for scenarios that only index a [subset of namespaces](elasticsearch.md#limit-the-number-of-namespaces-and-projects-that-can-be-indexed).
+The above instructions are not to be used for scenarios that only index a [subset of namespaces](elasticsearch.md#limit-the-amount-of-namespace-and-project-data-to-index).
See [Elasticsearch Index Scopes](elasticsearch.md#advanced-search-index-scopes) for more information on searching for specific types of data.
diff --git a/doc/integration/advanced_search/img/limit_namespace_filter.png b/doc/integration/advanced_search/img/limit_namespace_filter.png
deleted file mode 100644
index 437aecad467f09d2f0a60a9a3615f5539af35194..0000000000000000000000000000000000000000
Binary files a/doc/integration/advanced_search/img/limit_namespace_filter.png and /dev/null differ
diff --git a/doc/integration/advanced_search/img/limit_namespaces_projects_options.png b/doc/integration/advanced_search/img/limit_namespaces_projects_options.png
deleted file mode 100644
index a3cf9933b7edfa2970e493c4f0464cacbb59c296..0000000000000000000000000000000000000000
Binary files a/doc/integration/advanced_search/img/limit_namespaces_projects_options.png and /dev/null differ
diff --git a/ee/app/views/admin/application_settings/_elasticsearch_form.html.haml b/ee/app/views/admin/application_settings/_elasticsearch_form.html.haml
index 69c599ce3be0bad0ed036383d73ea14080a5513b..f4ef49275a79dc63be04be485fcc662e33d3c31c 100644
--- a/ee/app/views/admin/application_settings/_elasticsearch_form.html.haml
+++ b/ee/app/views/admin/application_settings/_elasticsearch_form.html.haml
@@ -145,7 +145,7 @@
- c.with_body do
%h4= _('Elasticsearch indexing restrictions')
.form-group
- = f.gitlab_ui_checkbox_component :elasticsearch_limit_indexing, s_('AdminSettings|Limit the number of namespaces and projects that can be indexed.'), checkbox_options: { class: 'js-limit-checkbox' }
+ = f.gitlab_ui_checkbox_component :elasticsearch_limit_indexing, s_("AdminSettings|Limit the amount of namespace and project data to index"), checkbox_options: { class: 'js-limit-checkbox' }
.form-group.js-limit-namespaces{ class: ('hidden' unless @application_setting.elasticsearch_limit_indexing) }
= f.label :elasticsearch_namespace_ids, _('Namespaces to index'), class: 'label-bold'
diff --git a/ee/spec/features/admin/admin_settings_spec.rb b/ee/spec/features/admin/admin_settings_spec.rb
index d541273580f0d2e916970b32ba7eda464791fc5e..25be62a5ad04ea0e8aa05cd6512241ba80307108 100644
--- a/ee/spec/features/admin/admin_settings_spec.rb
+++ b/ee/spec/features/admin/admin_settings_spec.rb
@@ -121,7 +121,7 @@
expect(page).not_to have_content('Namespaces to index')
expect(page).not_to have_content('Projects to index')
- check 'Limit the number of namespaces and projects that can be indexed.'
+ check 'Limit the amount of namespace and project data to index'
expect(page).to have_content('Namespaces to index')
expect(page).to have_content('Projects to index')
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index ba50eaa0e2d971896ed7732f0398d3c91539af41..129179313f7ea4e15538cfd6f6a0a80f61783ed6 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -3595,7 +3595,7 @@ msgstr ""
msgid "AdminSettings|Let's Encrypt email"
msgstr ""
-msgid "AdminSettings|Limit the number of namespaces and projects that can be indexed."
+msgid "AdminSettings|Limit the amount of namespace and project data to index"
msgstr ""
msgid "AdminSettings|Maximum downstream pipelines triggered in a project per user"