about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/api/statuses_controller.rb4
-rw-r--r--app/controllers/stream_entries_controller.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/api/statuses_controller.rb b/app/controllers/api/statuses_controller.rb
index a4b183ef1..f68f298d8 100644
--- a/app/controllers/api/statuses_controller.rb
+++ b/app/controllers/api/statuses_controller.rb
@@ -8,8 +8,8 @@ class Api::StatusesController < ApiController
 
   def context
     @status      = Status.find(params[:id])
-    @ancestors   = @status.ancestors.with_includes.with_counters.to_a
-    @descendants = @status.descendants.with_includes.with_counters.to_a
+    @ancestors   = @status.ancestors
+    @descendants = @status.descendants
   end
 
   def create
diff --git a/app/controllers/stream_entries_controller.rb b/app/controllers/stream_entries_controller.rb
index e25e7f5ed..0d6b9ea8e 100644
--- a/app/controllers/stream_entries_controller.rb
+++ b/app/controllers/stream_entries_controller.rb
@@ -9,8 +9,8 @@ class StreamEntriesController < ApplicationController
     @type = @stream_entry.activity_type.downcase
 
     if @stream_entry.activity_type == 'Status'
-      @ancestors   = @stream_entry.activity.ancestors.with_includes.with_counters
-      @descendants = @stream_entry.activity.descendants.with_includes.with_counters
+      @ancestors   = @stream_entry.activity.ancestors
+      @descendants = @stream_entry.activity.descendants
 
       if user_signed_in?
         status_ids  = [@stream_entry.activity_id] + @ancestors.map { |s| s.id } + @descendants.map { |s| s.id }