diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-07-22 15:20:14 +0200 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-07-22 15:20:14 +0200 |
| commit | b137e123042e61ca7fa6d36872c7a833dc799b2b (patch) | |
| tree | 4f5770a6139ac8147091075eac31237261ca9abe | |
| parent | 5ca1899a5f436cd1a8d0f6938fa1c22c1fd3d1a3 (diff) | |
| download | gitlab-ce-backport-elasticsearch-setting.tar.gz | |
Backport missing ElasticSearch settingbackport-elasticsearch-setting
This setting was added to EE in MR
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14728, but was
not backported to CE.
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 3a121addc98..494c4dd1f93 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -217,6 +217,7 @@ Gitlab.ee do Settings['elasticsearch'] ||= Settingslogic.new({}) Settings.elasticsearch['enabled'] = false if Settings.elasticsearch['enabled'].nil? Settings.elasticsearch['url'] = ENV['ELASTIC_URL'] || "http://localhost:9200" + Settings.elasticsearch['indexer_path'] ||= Gitlab::Utils.which('gitlab-elasticsearch-indexer') end # |