logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 264f0fde1b9f0cbaf7679eeb59938eb9ca653779
parent fd9260d1b500669862c839ce0168f5feeae6e2dd
Author: Alex Gleason <alex@alexgleason.me>
Date:   Mon, 27 Dec 2021 23:12:14 +0000

Merge branch 'admin-fix-duplicated-endpoints' into 'develop'

AdminAPI: fix duplicated routes

See merge request pleroma/pleroma!3581

Diffstat:

Mlib/pleroma/web/router.ex3---
1 file changed, 0 insertions(+), 3 deletions(-)

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex @@ -266,9 +266,6 @@ defmodule Pleroma.Web.Router do post("/users/revoke_invite", InviteController, :revoke) 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/:nickname", UserController, :show)