projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
add2681
)
fix module name
author
Maksim Pechnikov
<parallel588@gmail.com>
Thu, 22 Oct 2020 09:04:23 +0000
(12:04 +0300)
committer
Maksim Pechnikov
<parallel588@gmail.com>
Thu, 22 Oct 2020 09:04:23 +0000
(12:04 +0300)
lib/pleroma/web/admin_api/controllers/user_controller.ex
patch
|
blob
|
history
test/pleroma/web/admin_api/controllers/user_controller_test.exs
[moved from
test/web/admin_api/controllers/user_controller_test.exs
with 100% similarity]
patch
|
blob
|
history
diff --git
a/lib/pleroma/web/admin_api/controllers/user_controller.ex
b/lib/pleroma/web/admin_api/controllers/user_controller.ex
index 15cec9b0991f3187bfa4cb87b4d7a1835c1a3fef..a2a1c875de6de3848e0f8b5f64ceefae9f86ccd7 100644
(file)
--- a/
lib/pleroma/web/admin_api/controllers/user_controller.ex
+++ b/
lib/pleroma/web/admin_api/controllers/user_controller.ex
@@
-9,13
+9,13
@@
defmodule Pleroma.Web.AdminAPI.UserController do
only: [fetch_integer_param: 3]
alias Pleroma.ModerationLog
- alias Pleroma.Plugs.OAuthScopesPlug
alias Pleroma.User
alias Pleroma.Web.ActivityPub.Builder
alias Pleroma.Web.ActivityPub.Pipeline
alias Pleroma.Web.AdminAPI
alias Pleroma.Web.AdminAPI.AccountView
alias Pleroma.Web.AdminAPI.Search
+ alias Pleroma.Web.Plugs.OAuthScopesPlug
@users_page_size 50
diff --git
a/test/web/admin_api/controllers/user_controller_test.exs
b/test/pleroma/web/admin_api/controllers/user_controller_test.exs
similarity index 100%
rename from
test/web/admin_api/controllers/user_controller_test.exs
rename to
test/pleroma/web/admin_api/controllers/user_controller_test.exs