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

[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 8337bc8091ee6d1229f5727fca88cb42cc41f54e..cbdcace0cd80b1a7c87ea47535b2cb81328b75fa 100644 (file)
--- a/app/controllers/api/capabilities_controller.rb
+++ b/app/controllers/api/capabilities_controller.rb
@@ -1,10 +1,10 @@
 module Api
-  class CapabilitiesController < ApplicationController
-    skip_before_action :verify_authenticity_token
-    before_action :api_deny_access_handler
+  class CapabilitiesController < ApiController
+    skip_before_action :check_api_readable
 
     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