diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-07-22 21:40:53 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-07-22 21:40:53 +0000 |
| commit | 5595c9ded4d3e019c346f18de0f8509ded4a1b5d (patch) | |
| tree | 657b2dd7f0c80752a17fdd20c4f9184bb1931712 | |
| parent | 9881aa08bfe68224e7d37b5721ee4b026d94f739 (diff) | |
| parent | 8214ce34c83df459767af79955cfb123575f8b65 (diff) | |
| download | gitlab-ce-5595c9ded4d3e019c346f18de0f8509ded4a1b5d.tar.gz | |
Merge branch 'ce-4946-resolve-ee-config' into 'master'
Port EE specific settings to CE
See merge request gitlab-org/gitlab-ce!30998
| -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 # |