Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream

This commit is contained in:
Claire
2024-06-06 12:27:26 +02:00
136 changed files with 3195 additions and 1823 deletions

View File

@@ -191,8 +191,4 @@ class Api::V1::StatusesController < Api::BaseController
def serialized_accounts(accounts)
ActiveModel::Serializer::CollectionSerializer.new(accounts, serializer: REST::AccountSerializer)
end
def pagination_params(core_params)
params.slice(:limit).permit(:limit).merge(core_params)
end
end