Merge tooltip fixes/tests

[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 b4a2efc7c3043fd06d9aee6b7deaaa76dab6f59a..d4baf4a820a0c1dada9c5a4f13342d440f536a0f 100644 (file)
--- a/app/controllers/api/users_controller.rb
+++ b/app/controllers/api/users_controller.rb
@@ -1,11 +1,12 @@
 module Api
   class UsersController < ApiController
+    before_action :check_api_readable
     before_action :disable_terms_redirect, :only => [:details]
+    before_action :setup_user_auth, :only => [:show, :index]
     before_action :authorize, :only => [:details, :gpx_files]
 
     authorize_resource
 
-    before_action :check_api_readable
     around_action :api_call_handle_error
     before_action :lookup_user_by_id, :only => [:show]