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

[rails.git] / app / controllers / api / amf_controller.rb

diff --git a/app/controllers/api/amf_controller.rb b/app/controllers/api/amf_controller.rb
index 2a878d248930265490c5bbbd64b91870f0678785..0cf511d76333cb7ba9d0975c9019fd3fabbc91b3 100644 (file)
--- a/app/controllers/api/amf_controller.rb
+++ b/app/controllers/api/amf_controller.rb
@@ -36,10 +36,9 @@
 # * version conflict when POIs and ways are reverted
 
 module Api
 # * version conflict when POIs and ways are reverted
 
 module Api

-  class AmfController < ApplicationController
+  class AmfController < ApiController

     include Potlatch
 
     include Potlatch
 

-    skip_before_action :verify_authenticity_token

     before_action :check_api_writable
 
     # AMF Controller implements its own authentication and authorization checks
     before_action :check_api_writable
 
     # AMF Controller implements its own authentication and authorization checks


@@ -131,7 +130,7 @@ module Api
 
     def amf_handle_error_with_timeout(call, rootobj, rootid)
       amf_handle_error(call, rootobj, rootid) do
 
     def amf_handle_error_with_timeout(call, rootobj, rootid)
       amf_handle_error(call, rootobj, rootid) do

-        OSM::Timer.timeout(API_TIMEOUT, OSM::APITimeoutError) do
+        OSM::Timer.timeout(Settings.api_timeout, OSM::APITimeoutError) do

           yield
         end
       end
           yield
         end
       end