diff options
| author | kaniini <nenolod@gmail.com> | 2019-03-06 22:27:42 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-03-06 22:27:42 +0000 |
| commit | 0fe715f3ba0f787154ab8e86c8745d7f09affdcb (patch) | |
| tree | 3560d668fe7feec0dcce59858ee4e7a6fdd54e18 /lib/pleroma/web/router.ex | |
| parent | 39b766cc43c39dbff84cb498c4b4c764abdec9a0 (diff) | |
| parent | 76160122f6d7bf52aee929328acb4d216e4c3504 (diff) | |
| download | pleroma-0fe715f3ba0f787154ab8e86c8745d7f09affdcb.tar.gz | |
Merge branch 'chore/merge-search-into-list-users' into 'develop'
Merge search endpoint into /users
See merge request pleroma/pleroma!898
Diffstat (limited to 'lib/pleroma/web/router.ex')
| -rw-r--r-- | lib/pleroma/web/router.ex | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index fc322756a..65a90e31e 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -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) |