diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-05-04 18:17:32 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-05-04 18:17:32 +0000 |
| commit | cb62935c0b00f41ff5d4ab77a8cc38174b05d186 (patch) | |
| tree | 52714c8f33e66dcf6ff09957fb2e6d3d103c6fcb /app/controllers/activitypub/collections_controller.rb | |
| parent | b316d373ea5c239ab373a43a5c75abec8d5fc4aa (diff) | |
| parent | 2c1f7b2ece96c724f6230352974d4282ac51dfd5 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/controllers/activitypub/collections_controller.rb')
| -rw-r--r-- | app/controllers/activitypub/collections_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/activitypub/collections_controller.rb b/app/controllers/activitypub/collections_controller.rb index 081914016..96bf901a7 100644 --- a/app/controllers/activitypub/collections_controller.rb +++ b/app/controllers/activitypub/collections_controller.rb @@ -22,7 +22,7 @@ class ActivityPub::CollectionsController < Api::BaseController end def set_statuses - @statuses = scope_for_collection.paginate_by_max_id(20, params[:max_id], params[:since_id]) + @statuses = scope_for_collection @statuses = cache_collection(@statuses, Status) end |