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

[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 fd7b768dd90e52de127ea22e577e5f56eb3f5fe9..535d7393a5608d931145f3bce07abf9775b2aaae 100644 (file)
--- a/app/controllers/api/user_blocks/active_lists_controller.rb
+++ b/app/controllers/api/user_blocks/active_lists_controller.rb
@@ -7,7 +7,10 @@ module Api
 
       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