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

[rails.git] / app / controllers / site_controller.rb

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 8f4aafa4426f22ff3b914e36e1b7269c66bb2acd..4b960e4e2b9682fd6e49036a25fff89093988bf0 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -103,9 +103,7 @@ class SiteController < ApplicationController
     @locale = params[:copyright_locale] || I18n.locale
   end
 
     @locale = params[:copyright_locale] || I18n.locale
   end
 

-  def welcome
-    require_user
-  end
+  def welcome; end

 
   def help; end
 
 
   def help; end
 


@@ -123,7 +121,7 @@ class SiteController < ApplicationController
     append_content_security_policy_directives(
       :connect_src => %w[*],
       :img_src => %w[* blob:],
     append_content_security_policy_directives(
       :connect_src => %w[*],
       :img_src => %w[* blob:],

-      :script_src => %w[dev.virtualearth.net *.wikipedia.org www.wikidata.org services.arcgisonline.com serviceslab.arcgisonline.com 'unsafe-eval'],
+      :script_src => %w[dev.virtualearth.net 'unsafe-eval'],

       :style_src => %w['unsafe-inline']
     )
 
       :style_src => %w['unsafe-inline']
     )