Merge remote-tracking branch 'upstream/pull/1866'

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index fa8ec5a1ee0478036750be78dec10150fd391d0e..50508f885df09affbb2451a297b386dce522cac5 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -120,7 +120,7 @@ class SiteController < ApplicationController
     append_content_security_policy_directives(
       :connect_src => %w[*],
       :img_src => %w[* blob:],
-      :script_src => %w[dev.virtualearth.net 'unsafe-eval']
+      :script_src => %w[dev.virtualearth.net *.wikipedia.org www.wikidata.org 'unsafe-eval']
     )
 
     render "id", :layout => false

diff --git a/config/routes.rb b/config/routes.rb
index d750d5035bb6e90d88cca7a9bc7fd8e811a87d07..b46f9287743942e92d029cdf6cc09c223b9e04fa 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -266,7 +266,7 @@ OpenStreetMap::Application.routes.draw do
   match "/message/new/:display_name" => "messages#new", :via => [:get, :post], :as => "new_message"
   get "/message/read/:message_id" => "messages#show", :as => "message"
   post "/message/mark/:message_id" => "messages#mark", :as => "mark_message"
-  get "/message/reply/:message_id" => "messages#reply", :as => "reply_message"
+  match "/message/reply/:message_id" => "messages#reply", :via => [:get, :post], :as => "reply_message"
   post "/message/delete/:message_id" => "messages#destroy", :as => "destroy_message"
 
   # oauth admin pages (i.e: for setting up new clients, etc...)

diff --git a/test/controllers/messages_controller_test.rb b/test/controllers/messages_controller_test.rb
index b7bc3bad0cd8eb47bd131df8f76033a493d7980d..b5ca0dd3a7605d1e72de8511b6fe1d704f519c47 100644 (file)
--- a/test/controllers/messages_controller_test.rb
+++ b/test/controllers/messages_controller_test.rb
@@ -32,6 +32,10 @@ class MessagesControllerTest < ActionController::TestCase
       { :path => "/message/reply/1", :method => :get },
       { :controller => "messages", :action => "reply", :message_id => "1" }
     )
+    assert_routing(
+      { :path => "/message/reply/1", :method => :post },
+      { :controller => "messages", :action => "reply", :message_id => "1" }
+    )
     assert_routing(
       { :path => "/message/delete/1", :method => :post },
       { :controller => "messages", :action => "destroy", :message_id => "1" }