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

[rails.git] / app / controllers / api / user_blocks / active_lists_controller.rb

diff --git a/app/controllers/api/user_blocks/active_lists_controller.rb b/app/controllers/api/user_blocks/active_lists_controller.rb
index 132d94678b19fd1aadc1076852132870a1545cb0..535d7393a5608d931145f3bce07abf9775b2aaae 100644 (file)
--- a/app/controllers/api/user_blocks/active_lists_controller.rb
+++ b/app/controllers/api/user_blocks/active_lists_controller.rb
@@ -1,13 +1,16 @@
 module Api
   module UserBlocks
     class ActiveListsController < ApiController
-      before_action :authorize
+      before_action -> { authorize(:skip_blocks => true) }
 
       authorize_resource :class => :active_user_blocks_list
 
       before_action :set_request_formats
 
-      def show; end
+      def show
+        @user_blocks = current_user.blocks.active.order(:id => :desc)
+        @skip_reason = true
+      end
     end
   end
 end