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

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

diff --git a/app/controllers/api/traces_controller.rb b/app/controllers/api/traces_controller.rb
index d9b5bce258409b70501fd1033d4288d49ef8c688..76dfb3a2dc1bd4b6d57728b17b3f074894ef88cd 100644 (file)
--- a/app/controllers/api/traces_controller.rb
+++ b/app/controllers/api/traces_controller.rb
@@ -1,6 +1,5 @@
 module Api
   class TracesController < ApiController
 module Api
   class TracesController < ApiController

-    before_action :check_api_readable, :only => [:show, :data]

     before_action :check_api_writable, :only => [:create, :update, :destroy]
     before_action :set_locale
     before_action :authorize
     before_action :check_api_writable, :only => [:create, :update, :destroy]
     before_action :set_locale
     before_action :authorize


@@ -8,7 +7,7 @@ module Api
     authorize_resource
 
     before_action :offline_error, :only => [:create, :destroy, :data]
     authorize_resource
 
     before_action :offline_error, :only => [:create, :destroy, :data]

-    around_action :api_call_handle_error
+    skip_around_action :api_call_timeout, :only => :create

 
     def show
       @trace = Trace.visible.find(params[:id])
 
     def show
       @trace = Trace.visible.find(params[:id])