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

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

diff --git a/app/controllers/api/capabilities_controller.rb b/app/controllers/api/capabilities_controller.rb
index 68968d107c3a0fc2e447ca560b4bab7d0e5acdc9..80222c40bd93fb622753a5d672841cbe1fa2d12d 100644 (file)
--- a/app/controllers/api/capabilities_controller.rb
+++ b/app/controllers/api/capabilities_controller.rb
@@ -1,9 +1,8 @@
 module Api
   class CapabilitiesController < ApiController
-    before_action :api_deny_access_handler
-
     authorize_resource :class => false
 
+    before_action :set_request_formats
     around_action :api_call_handle_error, :api_call_timeout
 
     # External apps that use the api are able to query the api to find out some