diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2019-07-22 17:50:23 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2019-07-22 17:50:23 +0800 |
| commit | 32f12a5388991222cf6257facb8ee691c51aaf1e (patch) | |
| tree | 071095aa20f91d65e97de98dca14513d1bf74963 | |
| parent | b17e7e1b6f0ae9bfa4d18d2d010e3cf315ea9859 (diff) | |
| download | gitlab-ce-ce-4946-resolve-ee-config.tar.gz | |
Port EE specific settings to CEce-4946-resolve-ee-config
| -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 # |