hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'chore/merge-search-into-list-users' into 'develop'

Browse source 
Merge search endpoint into /users

See merge request pleroma/pleroma!898
This commit is contained in:
kaniini 2019-03-06 22:27:42 +00:00
commit 0fe715f3ba
5 changed files with 89 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/pleroma/web/router.ex
View file

@ -140,7 +140,6 @@ defmodule Pleroma.Web.Router do
pipe_through([:admin_api, :oauth_write])
get("/users", AdminAPIController, :list_users)
get("/users/search", AdminAPIController, :search_users)
delete("/user", AdminAPIController, :user_delete)
patch("/users/:nickname/toggle_activation", AdminAPIController, :user_toggle_activation)
post("/user", AdminAPIController, :user_create)