diff options
author | ThibG <thib@sitedethib.com> | 2020-09-01 17:36:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-01 17:36:30 +0200 |
commit | d967251fdc3826ad27d30e55258cfa4cdfd7c871 (patch) | |
tree | 91926ccaedf470bfef058cc7156f9f362d46186a /app/controllers/api/v1/conversations_controller.rb | |
parent | d95dd3883e0c7d1626f5e3b88d24af2627a641e2 (diff) | |
parent | 787a629b8f1df4cce53a9de7f3aa668cc9ef632f (diff) |
Merge pull request #1417 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api/v1/conversations_controller.rb')
-rw-r--r-- | app/controllers/api/v1/conversations_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/api/v1/conversations_controller.rb b/app/controllers/api/v1/conversations_controller.rb index bc8013379..6c7583403 100644 --- a/app/controllers/api/v1/conversations_controller.rb +++ b/app/controllers/api/v1/conversations_controller.rb @@ -32,7 +32,7 @@ class Api::V1::ConversationsController < Api::BaseController def paginated_conversations AccountConversation.where(account: current_account) - .paginate_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id)) + .to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id)) end def insert_pagination_headers |