Merge branch 'admin-fix-duplicated-endpoints' into 'develop'
AdminAPI: fix duplicated routes See merge request pleroma/pleroma!3581
This commit is contained in:
commit
264f0fde1b
|
@ -266,9 +266,6 @@ defmodule Pleroma.Web.Router do
|
||||||
post("/users/revoke_invite", InviteController, :revoke)
|
post("/users/revoke_invite", InviteController, :revoke)
|
||||||
post("/users/email_invite", InviteController, :email)
|
post("/users/email_invite", InviteController, :email)
|
||||||
|
|
||||||
patch("/users/force_password_reset", AdminAPIController, :force_password_reset)
|
|
||||||
get("/users/:nickname/credentials", AdminAPIController, :show_user_credentials)
|
|
||||||
|
|
||||||
get("/users", UserController, :index)
|
get("/users", UserController, :index)
|
||||||
get("/users/:nickname", UserController, :show)
|
get("/users/:nickname", UserController, :show)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue