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

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

diff --git a/app/controllers/api/ways_controller.rb b/app/controllers/api/ways_controller.rb
index a721f82f7ade94e92d51a76a2586cc64a9a96197..3b58f208b14e729a696a0f7e2e0ba0cd6ada631e 100644 (file)
--- a/app/controllers/api/ways_controller.rb
+++ b/app/controllers/api/ways_controller.rb
@@ -11,12 +11,7 @@ module Api
     before_action :check_api_readable, :except => [:create, :update, :delete]
     around_action :api_call_handle_error, :api_call_timeout
 
-    before_action :default_format_xml
-
-    # Set format to xml unless client requires a specific format
-    def default_format_xml
-      request.format = "xml" unless params[:format]
-    end
+    before_action :set_request_formats, :except => [:create, :update, :delete]
 
     def create
       assert_method :put