Merge remote-tracking branch 'parent/main' into upstream-20240604

This commit is contained in:
KMY 2024-06-04 08:02:05 +09:00
commit 8927b1444b
89 changed files with 1132 additions and 458 deletions

View file

@ -207,8 +207,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