diff options
| author | Mario de la Ossa <mariodelaossa@gmail.com> | 2019-04-30 19:51:57 -0600 |
|---|---|---|
| committer | Mario de la Ossa <mariodelaossa@gmail.com> | 2019-04-30 19:56:42 -0600 |
| commit | 29dae96550779766b30add16c5a634012e85275a (patch) | |
| tree | 772c2f3a76f9e13612aa43510849515652a37b3c | |
| parent | 7bdfc77d1862e1419afdc95668c816a330e14a34 (diff) | |
| download | gitlab-ce-ce-328-versioned-es-schema.tar.gz | |
Backport of 328-versioned-es-schemace-328-versioned-es-schema
| -rw-r--r-- | lib/api/settings.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/api/settings.rb b/lib/api/settings.rb index b064747e5fc..4ed6d1c2d43 100644 --- a/lib/api/settings.rb +++ b/lib/api/settings.rb @@ -150,6 +150,12 @@ module API given elasticsearch_indexing: ->(val) { val } do optional :elasticsearch_search, type: Boolean, desc: 'Enable Elasticsearch search' requires :elasticsearch_url, type: String, desc: 'The url to use for connecting to Elasticsearch. Use a comma-separated list to support clustering (e.g., "http://localhost:9200, http://localhost:9201")' + optional :elasticsearch_limit_indexing, type: Boolean, desc: 'Limit Elasticsearch to index certain namespaces and projects' + end + + given elasticsearch_limit_indexing: ->(val) { val } do + optional :elasticsearch_namespace_ids, type: Array[Integer], coerce_with: Validations::Types::LabelsList.coerce, desc: 'The namespace ids to index with Elasticsearch. Please send `-1` to remove all.' + optional :elasticsearch_project_ids, type: Array[Integer], coerce_with: Validations::Types::LabelsList.coerce, desc: 'The project ids to index with Elasticsearch. Please send `-1` to remove all.' end optional :email_additional_text, type: String, desc: 'Additional text added to the bottom of every email for legal/auditing/compliance reasons' |