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

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

-    around_action :api_call_handle_error

     load_resource :only => :show
 
     before_action :set_request_formats, :except => [:gpx_files]
     load_resource :only => :show
 
     before_action :set_request_formats, :except => [:gpx_files]