From: Tom Hughes <tom@compton.nu>
Date: Thu, 1 Jun 2017 21:33:06 +0000 (+0100)
Subject: Drop monkey patches that are no longer required
X-Git-Tag: live~3395
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f412c80d3f3fbb496fcd0baa09c464fa179dd839?hp=cdeb95092b4d3ba5979b5119369d3d1e89d486c7

Drop monkey patches that are no longer required
---

diff --git a/config/initializers/action_dispatch.rb b/config/initializers/action_dispatch.rb
index af446fc1d..687ce3fb1 100644
--- a/config/initializers/action_dispatch.rb
+++ b/config/initializers/action_dispatch.rb
@@ -1,17 +1,2 @@
 # Stop rails from automatically parsing XML in request bodies
 Rails.configuration.middleware.delete ActionDispatch::ParamsParser
-
-# https://github.com/rails/rails/issues/20710
-module ActionDispatch
-  module Assertions
-    def html_document_with_rss
-      @html_document ||= if @response.content_type == Mime::RSS
-                           Nokogiri::XML::Document.parse(@response.body)
-                         else
-                           html_document_without_rss
-                         end
-    end
-
-    alias_method_chain :html_document, :rss
-  end
-end
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index d117707be..180469bfc 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -38,16 +38,3 @@ Rails.application.config.middleware.use OmniAuth::Builder do
   provider :github, GITHUB_AUTH_ID, GITHUB_AUTH_SECRET, github_options if defined?(GITHUB_AUTH_ID)
   provider :mediawiki, WIKIPEDIA_AUTH_ID, WIKIPEDIA_AUTH_SECRET, wikipedia_options if defined?(WIKIPEDIA_AUTH_ID)
 end
-
-# Pending fix for: https://github.com/intridea/omniauth/pull/795
-module OmniAuth
-  module Strategy
-    def mock_callback_call_with_origin
-      @env["omniauth.origin"] = session["omniauth.origin"]
-
-      mock_callback_call_without_origin
-    end
-
-    alias_method_chain :mock_callback_call, :origin
-  end
-end