From: Tom Hughes Date: Sat, 13 Jan 2018 10:35:42 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/1707' X-Git-Tag: live~3789 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/9cf698322ce70e2fdb718be6624b0ac4e8eaf285 Merge remote-tracking branch 'upstream/pull/1707' --- 9cf698322ce70e2fdb718be6624b0ac4e8eaf285 diff --cc app/controllers/application_controller.rb index 9d1338ab5,4a803af72..a51dad875 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@@ -413,8 -413,8 +413,8 @@@ class ApplicationController < ActionCon def map_layout append_content_security_policy_directives( - :child_src => %w[127.0.0.1:8111 127.0.0.1:8112], + :child_src => %w[127.0.0.1:8111], - :connect_src => %w[nominatim.openstreetmap.org overpass-api.de router.project-osrm.org valhalla.mapzen.com], + :connect_src => %w[nominatim.openstreetmap.org overpass-api.de router.project-osrm.org], :form_action => %w[render.openstreetmap.org], :script_src => %w[graphhopper.com open.mapquestapi.com], :img_src => %w[developer.mapquest.com]