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

[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 e91261058efe05db7500626deacec804f562d581..00540a120e4da0c3c014befdfa5ffaf75098141b 100644 (file)
--- a/app/controllers/api/traces_controller.rb
+++ b/app/controllers/api/traces_controller.rb
@@ -1,6 +1,7 @@
 module Api
   class TracesController < ApiController
     before_action :check_api_writable, :only => [:create, :update, :destroy]
+    before_action :set_request_formats, :only => [:show]
     before_action :set_locale
     before_action :authorize
 
@@ -12,7 +13,12 @@ module Api
     def show
       @trace = Trace.visible.find(params[:id])
 
-      head :forbidden unless @trace.public? || @trace.user == current_user
+      return head :forbidden unless @trace.public? || @trace.user == current_user
+
+      respond_to do |format|
+        format.xml
+        format.json
+      end
     end
 
     def create