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

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

diff --git a/app/controllers/api/permissions_controller.rb b/app/controllers/api/permissions_controller.rb
index b24aca776dcfef6afeb0d0c476aaaea6bd46d5b4..9b168e04b568e5c1f880f0f2a035a11f1dc74c44 100644 (file)
--- a/app/controllers/api/permissions_controller.rb
+++ b/app/controllers/api/permissions_controller.rb
@@ -1,8 +1,5 @@
 module Api
 module Api

-  class PermissionsController < ApplicationController
-    skip_before_action :verify_authenticity_token
-    before_action :api_deny_access_handler
-
+  class PermissionsController < ApiController

     authorize_resource :class => false
 
     before_action :check_api_readable
     authorize_resource :class => false
 
     before_action :check_api_readable