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

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

diff --git a/app/controllers/api/users_controller.rb b/app/controllers/api/users_controller.rb
index 5ff275ee9dc52f268b250d52f445dd71a3295b1c..462b4ba3c48f8ae0ea5f37af172e28c79d68fd3d 100644 (file)
--- a/app/controllers/api/users_controller.rb
+++ b/app/controllers/api/users_controller.rb
@@ -2,14 +2,13 @@ module Api
   class UsersController < ApiController
     before_action :disable_terms_redirect, :only => [:details]
     before_action :setup_user_auth, :only => [:show, :index]
   class UsersController < ApiController
     before_action :disable_terms_redirect, :only => [:details]
     before_action :setup_user_auth, :only => [:show, :index]

-    before_action :authorize, :only => [:details, :gpx_files]
+    before_action :authorize, :only => [:details]

 
     authorize_resource
 
 
     authorize_resource
 

-    around_action :api_call_handle_error

     load_resource :only => :show
 
     load_resource :only => :show
 

-    before_action :set_request_formats, :except => [:gpx_files]
+    before_action :set_request_formats

 
     def index
       raise OSM::APIBadUserInput, "The parameter users is required, and must be of the form users=id[,id[,id...]]" unless params["users"]
 
     def index
       raise OSM::APIBadUserInput, "The parameter users is required, and must be of the form users=id[,id[,id...]]" unless params["users"]


@@ -48,11 +47,6 @@ module Api
       end
     end
 
       end
     end
 

-    def gpx_files
-      @traces = current_user.traces.reload
-      render :content_type => "application/xml"
-    end
-

     private
 
     def disable_terms_redirect
     private
 
     def disable_terms_redirect