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

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

diff --git a/app/controllers/api/users/traces_controller.rb b/app/controllers/api/users/traces_controller.rb
index 379515d490b94c6a848976d9b4fb928d84a9d24c..769aca34dc98cd42c70778032de27ae413d1b7ff 100644 (file)
--- a/app/controllers/api/users/traces_controller.rb
+++ b/app/controllers/api/users/traces_controller.rb
@@ -2,12 +2,16 @@ module Api
   module Users
     class TracesController < ApiController
       before_action :authorize
+      before_action :set_request_formats
 
       authorize_resource :trace
 
       def index
         @traces = current_user.traces.reload
-        render :content_type => "application/xml"
+        respond_to do |format|
+          format.xml
+          format.json
+        end
       end
     end
   end