diff options
| author | Ondřej Hruška <ondra@ondrovo.com> | 2017-09-28 09:18:35 +0200 |
|---|---|---|
| committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-09-28 09:18:35 +0200 |
| commit | 83bda6c1a813c5aeb131b18a0500fed0c07fa9c2 (patch) | |
| tree | 32f197901b4b16ea7f94de682fee6cdc44686045 /config/initializers/ostatus.rb | |
| parent | fcf0d2078ea813e0dd318fa154d620018e7b7bcf (diff) | |
| parent | b9f59ebcc68e9da0a7158741a1a2ef3564e1321e (diff) | |
Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream
Diffstat (limited to 'config/initializers/ostatus.rb')
| -rw-r--r-- | config/initializers/ostatus.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config/initializers/ostatus.rb b/config/initializers/ostatus.rb index c00aba0de..ba96fda22 100644 --- a/config/initializers/ostatus.rb +++ b/config/initializers/ostatus.rb @@ -18,7 +18,6 @@ Rails.application.configure do config.action_mailer.default_url_options = { host: web_host, protocol: https ? 'https://' : 'http://', trailing_slash: false } config.x.streaming_api_base_url = 'ws://localhost:4000' - config.x.use_ostatus_privacy = true if Rails.env.production? config.x.streaming_api_base_url = ENV.fetch('STREAMING_API_BASE_URL') { "ws#{https ? 's' : ''}://#{web_host}" } |