techhub/mastodon
2
0
Fork 0
Code Activity

Add OCR tool to media editing modal (#11566)

Browse Source
This commit is contained in:
Eugen Rochko
2019-08-15 15:13:26 +02:00
committed by GitHub
parent f178a01c11
commit 28636f43e4
10 changed files with 275 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/initializers/content_security_policy.rb
View File

@@ -20,11 +20,11 @@ Rails.application.config.content_security_policy do |p|
if Rails.env.development?
webpacker_urls = %w(ws http).map { |protocol| "#{protocol}#{Webpacker.dev_server.https? ? 's' : ''}://#{Webpacker.dev_server.host_with_port}" }
p.connect_src :self, :blob, assets_host, Rails.configuration.x.streaming_api_base_url, *webpacker_urls
p.script_src :self, :unsafe_inline, :unsafe_eval, assets_host
p.connect_src :self, :data, :blob, assets_host, Rails.configuration.x.streaming_api_base_url, *webpacker_urls
p.script_src :self, :blob, :unsafe_inline, :unsafe_eval, assets_host
else
p.connect_src :self, :blob, assets_host, Rails.configuration.x.streaming_api_base_url
p.script_src :self, assets_host
p.connect_src :self, :data, :blob, assets_host, Rails.configuration.x.streaming_api_base_url
p.script_src :self, :blob, assets_host
end
end