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

[rails.git] / config / initializers / omniauth.rb

diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index 7889fca815b8aab7387efecc792c91b19ef30489..5ca4ccffa8d6dcde54f557d82ffa1612663f04e1 100644 (file)
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -1,3 +1,4 @@
+require "multi_json"

 require "openid/fetchers"
 require "openid/util"
 
 require "openid/fetchers"
 require "openid/util"
 


@@ -8,6 +9,7 @@ OpenID::Util.logger = Rails.logger
 
 OmniAuth.config.logger = Rails.logger
 OmniAuth.config.failure_raise_out_environments = []
 
 OmniAuth.config.logger = Rails.logger
 OmniAuth.config.failure_raise_out_environments = []

+OmniAuth.config.allowed_request_methods = [:post, :patch]

 
 if Settings.key?(:memcache_servers)
   require "openid/store/memcache"
 
 if Settings.key?(:memcache_servers)
   require "openid/store/memcache"