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 738642fff7dc56531bec8d550c3a5f31dcc414b6..76dfb3a2dc1bd4b6d57728b17b3f074894ef88cd 100644 (file)
--- a/app/controllers/api/traces_controller.rb
+++ b/app/controllers/api/traces_controller.rb
@@ -7,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])