From: Tom Hughes <tom@compton.nu>
Date: Sun, 26 Feb 2017 22:22:48 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1467'
X-Git-Tag: live~3586
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/428e7d6baa28ecb7d06f1f851fdd69ef00249bfb?hp=-c

Merge remote-tracking branch 'openstreetmap/pull/1467'
---

428e7d6baa28ecb7d06f1f851fdd69ef00249bfb
diff --combined app/controllers/application_controller.rb
index 10901fdd5,15d7781d8..26bb92f9a
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@@ -61,7 -61,8 +61,8 @@@ class ApplicationController < ActionCon
      # method, otherwise an OAuth token was used, which has to be checked.
      unless current_token.nil?
        unless current_token.read_attribute(cap)
-         report_error "OAuth token doesn't have that capability.", :forbidden
+         set_locale
+         report_error t("oauth.permissions.missing"), :forbidden
          false
        end
      end
@@@ -407,11 -408,6 +408,11 @@@
    end
  
    def map_layout
 +    append_content_security_policy_directives(
 +      :connect_src => %w(nominatim.openstreetmap.org overpass-api.de router.project-osrm.org valhalla.mapzen.com),
 +      :script_src => %w(graphhopper.com open.mapquestapi.com)
 +    )
 +
      request.xhr? ? "xhr" : "map"
    end