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

[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 7f91557f85849b74bf749daf590dbe77aa3f582d..b0600ca33517024cfddfb446bdf14f205f1d1527 100644 (file)
--- a/app/controllers/api/capabilities_controller.rb
+++ b/app/controllers/api/capabilities_controller.rb
@@ -1,8 +1,10 @@
 module Api
   class CapabilitiesController < ApiController
 module Api
   class CapabilitiesController < ApiController

+    skip_before_action :check_api_readable
+

     authorize_resource :class => false
 
     authorize_resource :class => false
 

-    around_action :api_call_handle_error, :api_call_timeout
+    before_action :set_request_formats

 
     # External apps that use the api are able to query the api to find out some
     # parameters of the API. It currently returns:
 
     # External apps that use the api are able to query the api to find out some
     # parameters of the API. It currently returns: