diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-13 06:10:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-13 06:10:19 +0300 |
| commit | 3c988b99e6a6232f26a1e18c2c2d6304e30570f3 (patch) | |
| tree | 38d3135bd96a85aaf2061ff2c6d0a66cc1d415f9 /doc/api/settings.md | |
| parent | 5cf4cf3425de200493ba6a48802bf9965723010c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api/settings.md')
| -rw-r--r-- | doc/api/settings.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/api/settings.md b/doc/api/settings.md index 0f0a36c0b5d..ada1d0e7fc4 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -277,7 +277,9 @@ listed in the descriptions of the relevant settings. | `elasticsearch_namespace_ids` | array of integers | no | **(PREMIUM)** The namespaces to index via Elasticsearch if `elasticsearch_limit_indexing` is enabled. | | `elasticsearch_project_ids` | array of integers | no | **(PREMIUM)** The projects to index via Elasticsearch if `elasticsearch_limit_indexing` is enabled. | | `elasticsearch_search` | boolean | no | **(PREMIUM)** Enable Elasticsearch search. | -| `elasticsearch_url` | string | no | **(PREMIUM)** The URL to use for connecting to Elasticsearch. Use a comma-separated list to support cluster (for example, `http://localhost:9200, http://localhost:9201"`). If your Elasticsearch instance is password protected, pass the `username:password` in the URL (for example, `http://<username>:<password>@<elastic_host>:9200/`). | +| `elasticsearch_url` | string | no | **(PREMIUM)** The URL to use for connecting to Elasticsearch. Use a comma-separated list to support cluster (for example, `http://localhost:9200, http://localhost:9201"`). | +| `elasticsearch_username` | string | no | **(PREMIUM)** The `username` of your Elasticsearch instance. | +| `elasticsearch_password` | string | no | **(PREMIUM)** The password of your Elasticsearch instance. | | `email_additional_text` | string | no | **(PREMIUM)** Additional text added to the bottom of every email for legal/auditing/compliance reasons. | | `email_author_in_body` | boolean | no | Some email servers do not support overriding the email sender name. Enable this option to include the name of the author of the issue, merge request or comment in the email body instead. | | `enabled_git_access_protocol` | string | no | Enabled protocols for Git access. Allowed values are: `ssh`, `http`, and `nil` to allow both protocols. | |