projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
[akkoma]
/
lib
/
pleroma
/
web
/
router.ex
diff --git
a/lib/pleroma/web/router.ex
b/lib/pleroma/web/router.ex
index 8497685a692f5578766db05c2eecdc3522ea1440..cb818b3ccc1d6179f262ce2d9f379ee8a857db33 100644
(file)
--- a/
lib/pleroma/web/router.ex
+++ b/
lib/pleroma/web/router.ex
@@
-33,14
+33,15
@@
defmodule Pleroma.Web.Router do
plug :accepts, ["html", "json"]
end
plug :accepts, ["html", "json"]
end
- pipeline :p
assword_reset
do
- plug :accepts, ["html"]
+ pipeline :p
leroma_api
do
+ plug :accepts, ["html"
, "json"
]
end
scope "/api/pleroma", Pleroma.Web.TwitterAPI do
end
scope "/api/pleroma", Pleroma.Web.TwitterAPI do
- pipe_through :p
assword_reset
+ pipe_through :p
leroma_api
get "/password_reset/:token", UtilController, :show_password_reset
post "/password_reset", UtilController, :password_reset
get "/password_reset/:token", UtilController, :show_password_reset
post "/password_reset", UtilController, :password_reset
+ get "/emoji", UtilController, :emoji
end
scope "/oauth", Pleroma.Web.OAuth do
end
scope "/oauth", Pleroma.Web.OAuth do