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

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

diff --git a/app/controllers/api/versions_controller.rb b/app/controllers/api/versions_controller.rb
index 7de335091e2a92d754d84723bc8722ea7cb29a77..15cde9d6d606254168d41aed2fcca14da90f8f51 100644 (file)
--- a/app/controllers/api/versions_controller.rb
+++ b/app/controllers/api/versions_controller.rb
@@ -1,8 +1,9 @@
 module Api
   class VersionsController < ApiController
 module Api
   class VersionsController < 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

 
     # Show the list of available API versions. This will replace the global
     # unversioned capabilities call in due course.
 
     # Show the list of available API versions. This will replace the global
     # unversioned capabilities call in due course.