summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMario de la Ossa <mariodelaossa@gmail.com>2019-04-30 19:51:57 -0600
committerMario de la Ossa <mariodelaossa@gmail.com>2019-05-02 22:22:45 -0600
commit03608aa103144bb085b91d532c93115811453d4c (patch)
tree849fb13b4dff25043b6ce6ee62ef280f3d7da1e0
parent7bdfc77d1862e1419afdc95668c816a330e14a34 (diff)
downloadgitlab-ce-03608aa103144bb085b91d532c93115811453d4c.tar.gz
Backport of 328-versioned-es-schemace-11225-es_limited_namespaces_removal
-rw-r--r--lib/api/settings.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/api/settings.rb b/lib/api/settings.rb
index b064747e5fc..8046acfa397 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.'
+ optional :elasticsearch_project_ids, type: Array[Integer], coerce_with: Validations::Types::LabelsList.coerce, desc: 'The project ids to index with Elasticsearch.'
end
optional :email_additional_text, type: String, desc: 'Additional text added to the bottom of every email for legal/auditing/compliance reasons'