aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-01-08 07:48:19 -0600
committerAlex Gleason <alex@alexgleason.me>2021-01-08 07:48:19 -0600
commite73c7fa7e58cf507aad03e8adbc55742f77b74c2 (patch)
tree756ebdebc2b4f61e0116649bc086303827e14506 /lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
parent1b98cd86104bc8ffbbb550a6770deb94b5dbbfc7 (diff)
parent80167e62dd7afaf761443d268d7c2306608ffea4 (diff)
downloadpleroma-e73c7fa7e58cf507aad03e8adbc55742f77b74c2.tar.gz
Merge remote-tracking branch 'upstream/develop' into confirm-users
Diffstat (limited to 'lib/pleroma/web/admin_api/controllers/admin_api_controller.ex')
-rw-r--r--lib/pleroma/web/admin_api/controllers/admin_api_controller.ex3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
index 6ef8d6061..1c7c26d98 100644
--- a/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
+++ b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
@@ -110,7 +110,8 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
limit: page_size,
offset: (page - 1) * page_size,
godmode: godmode,
- exclude_reblogs: not with_reblogs
+ exclude_reblogs: not with_reblogs,
+ pagination_type: :offset
})
conn