diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2019-07-22 12:50:23 +0300 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2019-07-22 23:30:59 +0300 |
commit | 8214ce34c83df459767af79955cfb123575f8b65 (patch) | |
tree | b1de69a8d4565d90d44c41416699e22678adbf0c /config/initializers | |
parent | da6b7a12a6051995b4b68b783d8876f51640eddf (diff) |
Port EE specific settings to CE
Diffstat (limited to 'config/initializers')
-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 # |