Merge branch '6587-es-indexer-is-beta-now' into 'master'

Resolve "Mark experimental ES indexer as beta, not experimental"

Closes #6587

See merge request gitlab-org/gitlab-ee!6384

doc/api/settings.md

@@ -100,7 +100,7 @@ PUT /application/settings
 | `elasticsearch_aws_region`               | string           | no                                            | The AWS region the elasticsearch domain is configured                                                                                                                                                                                                                                                                                                                                                                                                     |
 | `elasticsearch_aws_secret_access_key`    | string           | no                                            | AWS IAM secret access key                                                                                                                                                                                                                                                                                                                                                                                                                                 |
 | `elasticsearch_aws`                      | boolean          | no                                            | Enable the use of AWS hosted Elasticsearch                                                                                                                                                                                                                                                                                                                                                                                                                |
-| `elasticsearch_experimental_indexer`     | boolean          | no                                            | Use the experimental elasticsearch indexer. More info: https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer                                                                                                                                                                                                                                                                                                                                         |
+| `elasticsearch_experimental_indexer`     | boolean          | no                                            | Use the beta elasticsearch indexer. More info: https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer                                                                                                                                                                                                                                                                                                                                         |
 | `elasticsearch_indexing`                 | boolean          | no                                            | Enable Elasticsearch indexing                                                                                                                                                                                                                                                                                                                                                                                                                             |
 | `elasticsearch_search`                   | boolean          | no                                            | Enable Elasticsearch search                                                                                                                                                                                                                                                                                                                                                                                                                               |
 | `elasticsearch_url`                      | string           | no                                            | The url to use for connecting to Elasticsearch. Use a comma-separated list to support cluster (e.g., "http://localhost:9200, http://localhost:9201")                                                                                                                                                                                                                                                                                                      |

doc/development/elasticsearch.md

@@ -26,9 +26,9 @@ brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/f1a767645f
 
 There is no need to install any plugins
 
-## Experimental indexer
+## New repo indexer (beta)
 
-If you're interested on working with the experimental indexer, all you need to do is:
+If you're interested on working with the new beta repo indexer, all you need to do is:
 
 - git clone git@gitlab.com:gitlab-org/gitlab-elasticsearch-indexer.git
 - make
@@ -114,4 +114,4 @@ Uses an [Edge NGram token filter](https://www.elastic.co/guide/en/elasticsearch/
 ## Gotchas
 
 - Searches can have their own analyzers. Remember to check when editing analyzers
-- `Character` filters (as opposed to token filters) always replace the original character, so they're not a good choice as they can hinder exact searches
\ No newline at end of file
+- `Character` filters (as opposed to token filters) always replace the original character, so they're not a good choice as they can hinder exact searches

doc/integration/elasticsearch.md

@@ -59,7 +59,7 @@ The following Elasticsearch settings are available:
 | Parameter                           | Description |
 | ---------                           | ----------- |
 | `Elasticsearch indexing`            | Enables/disables Elasticsearch indexing. You may want to enable indexing but disable search in order to give the index time to be fully completed, for example. Also keep in mind that this option doesn't have any impact on existing data, this only enables/disables background indexer which tracks data changes. So by enabling this you will not get your existing data indexed, use special rake task for that as explained in [Adding GitLab's data to the Elasticsearch index](#adding-gitlabs-data-to-the-elasticsearch-index). |
-| `Use experimental repository indexer` | Perform repository indexing using [GitLab Elasticsearch Indexer](https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer). |
+| `Use the new repository indexer (beta)` | Perform repository indexing using [GitLab Elasticsearch Indexer](https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer). |
 | `Search with Elasticsearch enabled` | Enables/disables using Elasticsearch in search. |
 | `URL`                              | The URL to use for connecting to Elasticsearch. Use a comma-separated list to support clustering (e.g., "http://host1, https://host2:9200"). |
 | `Using AWS hosted Elasticsearch with IAM credentials` | Sign your Elasticsearch requests using [AWS IAM authorization][aws-iam] or [AWS EC2 Instance Profile Credentials][aws-instance-profile]. The policies must be configured to allow `es:*` actions. |

ee/app/views/admin/application_settings/_elasticsearch_form.html.haml

@@ -14,7 +14,7 @@
         .form-check
           = f.check_box :elasticsearch_experimental_indexer, disabled: missing, class: 'form-check-input'
           = f.label :elasticsearch_experimental_indexer, class: 'form-check-label' do
-            Use <a href="https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer">experimental repository indexer</a>
+            Use the <a href="https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer">new repository indexer (beta)</a>
             - if missing
               (not installed)