logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 5a8c149f6b928b0463adf77de41e6b208aacdc5c
parent: 8459acd1234e9efcbf106e3eaa00ca871717d386
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Thu, 18 Aug 2016 18:08:25 +0200

Fix ActionCable origin checking

Diffstat:

Mconfig/initializers/ostatus.rb2++
1 file changed, 2 insertions(+), 0 deletions(-)

diff --git a/config/initializers/ostatus.rb b/config/initializers/ostatus.rb @@ -4,4 +4,6 @@ Rails.application.configure do config.x.use_https = ENV['LOCAL_HTTPS'] == 'true' config.action_mailer.default_url_options = { host: config.x.local_domain, protocol: config.x.use_https ? 'https://' : 'http://' } + + config.action_cable.allowed_request_origins = ["http#{config.x.use_https ? 's' : ''}://#{config.x.local_domain}"] end