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

diff --git a/app/controllers/api/changesets_controller.rb b/app/controllers/api/changesets_controller.rb
index 9a179135f4314c4b29d235122c78f3c9a37d5697..78a5b48e3ff6025e0a9f4f81576ea14e4e6487b1 100644 (file)
--- a/app/controllers/api/changesets_controller.rb
+++ b/app/controllers/api/changesets_controller.rb
@@ -2,8 +2,6 @@
 
 module Api
   class ChangesetsController < ApiController
-    require "xml/libxml"
-
     before_action :check_api_writable, :only => [:create, :update, :upload, :subscribe, :unsubscribe]
     before_action :check_api_readable, :except => [:create, :update, :upload, :download, :query, :subscribe, :unsubscribe]
     before_action :setup_user_auth, :only => [:show]

diff --git a/app/controllers/api/nodes_controller.rb b/app/controllers/api/nodes_controller.rb
index 0604aa356576655569bbf4adb218cf636762a76e..dc7d04dc5792d93698aa7ddc8b899a0592485c86 100644 (file)
--- a/app/controllers/api/nodes_controller.rb
+++ b/app/controllers/api/nodes_controller.rb
@@ -2,8 +2,6 @@
 
 module Api
   class NodesController < ApiController
-    require "xml/libxml"
-
     before_action :check_api_writable, :only => [:create, :update, :delete]
     before_action :check_api_readable, :except => [:create, :update, :delete]
     before_action :authorize, :only => [:create, :update, :delete]

diff --git a/app/controllers/api/old_controller.rb b/app/controllers/api/old_controller.rb
index 7c9c32e639a12602ee6678bcf800fdbbf5f1cb1c..5b16b453d6f92f1acbb65064c49ce2201325f2a4 100644 (file)
--- a/app/controllers/api/old_controller.rb
+++ b/app/controllers/api/old_controller.rb
@@ -3,8 +3,6 @@
 # nodes, ways and relations are basically identical.
 module Api
   class OldController < ApiController
-    require "xml/libxml"
-
     before_action :check_api_readable
     before_action :check_api_writable, :only => [:redact]
     before_action :setup_user_auth, :only => [:history, :show]

diff --git a/app/controllers/api/relations_controller.rb b/app/controllers/api/relations_controller.rb
index 3ce39c4cfb528113943b0782abb1625ffeaa0cac..e82ac6368a371fb43bb2bfaa6e7db071f3f0ddef 100644 (file)
--- a/app/controllers/api/relations_controller.rb
+++ b/app/controllers/api/relations_controller.rb
@@ -1,7 +1,5 @@
 module Api
   class RelationsController < ApiController
-    require "xml/libxml"
-
     before_action :check_api_writable, :only => [:create, :update, :delete]
     before_action :check_api_readable, :except => [:create, :update, :delete]
     before_action :authorize, :only => [:create, :update, :delete]

diff --git a/app/controllers/api/ways_controller.rb b/app/controllers/api/ways_controller.rb
index 0828e311f353cb1265ef5138427caf097001d9f0..f8254d8027bacbd43fe8e0c6c641c78b8b04e338 100644 (file)
--- a/app/controllers/api/ways_controller.rb
+++ b/app/controllers/api/ways_controller.rb
@@ -1,7 +1,5 @@
 module Api
   class WaysController < ApiController
-    require "xml/libxml"
-
     before_action :check_api_writable, :only => [:create, :update, :delete]
     before_action :check_api_readable, :except => [:create, :update, :delete]
     before_action :authorize, :only => [:create, :update, :delete]

diff --git a/app/controllers/changesets_controller.rb b/app/controllers/changesets_controller.rb
index 613a3ee2a9f919522a060361c063052c020ea879..812db6016347de3ae472e11e7e0173d615e116ce 100644 (file)
--- a/app/controllers/changesets_controller.rb
+++ b/app/controllers/changesets_controller.rb
@@ -4,7 +4,6 @@ class ChangesetsController < ApplicationController
   include UserMethods
 
   layout "site"
-  require "xml/libxml"
 
   before_action :authorize_web
   before_action :set_locale