projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into refactor/discoverable_user_field
[akkoma]
/
lib
/
pleroma
/
web
/
admin_api
/
controllers
/
admin_api_controller.ex
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 d5713c3dd968265b4bd2ba30b90274c00281d29f..bdd3e195d177b80b83bc21c92e792bd5c3b6ac14 100644
(file)
--- a/
lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
+++ b/
lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
@@
-10,7
+10,6
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
alias Pleroma.Config
alias Pleroma.MFA
alias Pleroma.ModerationLog
alias Pleroma.Config
alias Pleroma.MFA
alias Pleroma.ModerationLog
- alias Pleroma.Plugs.OAuthScopesPlug
alias Pleroma.Stats
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Stats
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
@@
-21,6
+20,7
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
alias Pleroma.Web.AdminAPI.ModerationLogView
alias Pleroma.Web.AdminAPI.Search
alias Pleroma.Web.Endpoint
alias Pleroma.Web.AdminAPI.ModerationLogView
alias Pleroma.Web.AdminAPI.Search
alias Pleroma.Web.Endpoint
+ alias Pleroma.Web.Plugs.OAuthScopesPlug
alias Pleroma.Web.Router
@users_page_size 50
alias Pleroma.Web.Router
@users_page_size 50