From d2798d607e11e0ebae83ae909404834388733428 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 16 Sep 2019 12:06:26 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 config/gitlab.yml.example | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'config/gitlab.yml.example')

diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 92674aafa90..814ea551e19 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -982,6 +982,10 @@ production: &base
     # Default is '.gitlab_workhorse_secret' relative to Rails.root (i.e. root of the GitLab app).
     # secret_file: /home/git/gitlab/.gitlab_workhorse_secret
 
+  ## GitLab Elasticsearch settings
+  elasticsearch:
+    indexer_path: /home/git/gitlab-elasticsearch-indexer/
+
   ## Git settings
   # CAUTION!
   # Use the default values unless you really know what you are doing
-- 
cgit v1.2.1