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

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

diff --git a/app/controllers/api/user_preferences_controller.rb b/app/controllers/api/user_preferences_controller.rb
index db779a35e0752e77dd9794bd211409f5672d01cc..d1bd6d6242bc5713ce28054630e26341f711bc28 100644 (file)
--- a/app/controllers/api/user_preferences_controller.rb
+++ b/app/controllers/api/user_preferences_controller.rb
@@ -1,14 +1,11 @@
 # Update and read user preferences, which are arbitrary key/val pairs
 module Api
   class UserPreferencesController < ApiController
 # Update and read user preferences, which are arbitrary key/val pairs
 module Api
   class UserPreferencesController < ApiController

-    before_action :check_api_readable

     before_action :check_api_writable, :only => [:update_all, :update, :destroy]
     before_action :authorize
 
     authorize_resource
 
     before_action :check_api_writable, :only => [:update_all, :update, :destroy]
     before_action :authorize
 
     authorize_resource
 

-    around_action :api_call_handle_error
-

     before_action :set_request_formats
 
     ##
     before_action :set_request_formats
 
     ##