diff options
| author | ThibG <thib@sitedethib.com> | 2020-04-17 22:36:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-17 22:36:48 +0200 |
| commit | 62e65dca11e1c39630db2958c514c45407dcdfa7 (patch) | |
| tree | 92b5f9a2f93a2355dd94bac7e63e8fd9c552dafb /config | |
| parent | 5fdd5eef5a6b05b072a57e065954fdcb0b4a8898 (diff) | |
| parent | 81ef26b67d01aaa693edbdcf7a8f2a6cdfd56920 (diff) | |
Merge pull request #1318 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/chewy.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/initializers/chewy.rb b/config/initializers/chewy.rb index 9ff0dccc1..18d2f18c1 100644 --- a/config/initializers/chewy.rb +++ b/config/initializers/chewy.rb @@ -23,3 +23,9 @@ module Chewy end end end + +# ElasticSearch uses Faraday internally. Faraday interprets the +# http_proxy env variable by default which leads to issues when +# Mastodon is run with hidden services enabled, because +# ElasticSearch is *not* supposed to be accessed through a proxy +Faraday.ignore_env_proxy = true |