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

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

diff --git a/app/controllers/api/relations_controller.rb b/app/controllers/api/relations_controller.rb
index e82ac6368a371fb43bb2bfaa6e7db071f3f0ddef..a9b85de7dc3f68d40fa84cab7b782b0766fda9e9 100644 (file)
--- a/app/controllers/api/relations_controller.rb
+++ b/app/controllers/api/relations_controller.rb
@@ -1,14 +1,11 @@
 module Api
   class RelationsController < ApiController
     before_action :check_api_writable, :only => [:create, :update, :delete]
 module Api
   class RelationsController < ApiController
     before_action :check_api_writable, :only => [:create, :update, :delete]

-    before_action :check_api_readable, :except => [:create, :update, :delete]

     before_action :authorize, :only => [:create, :update, :delete]
 
     authorize_resource
 
     before_action :require_public_data, :only => [:create, :update, :delete]
     before_action :authorize, :only => [:create, :update, :delete]
 
     authorize_resource
 
     before_action :require_public_data, :only => [:create, :update, :delete]

-    around_action :api_call_handle_error, :api_call_timeout
-

     before_action :set_request_formats, :except => [:create, :update, :delete]
     before_action :check_rate_limit, :only => [:create, :update, :delete]
 
     before_action :set_request_formats, :except => [:create, :update, :delete]
     before_action :check_rate_limit, :only => [:create, :update, :delete]
 


@@ -51,8 +48,6 @@ module Api
     end
 
     def update
     end
 
     def update

-      logger.debug request.raw_post
-

       relation = Relation.find(params[:id])
       new_relation = Relation.from_xml(request.raw_post)
 
       relation = Relation.find(params[:id])
       new_relation = Relation.from_xml(request.raw_post)