projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'features/cleanup-incoming-actor' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
router.ex
diff --git
a/lib/pleroma/web/router.ex
b/lib/pleroma/web/router.ex
index f6c1282832b23de5d5d565a931d950ffbdebd342..9654ab8a3fe7402c358edc8654bffb9a7c6c487b 100644
(file)
--- a/
lib/pleroma/web/router.ex
+++ b/
lib/pleroma/web/router.ex
@@
-229,9
+229,9
@@
defmodule Pleroma.Web.Router do
pipe_through(:pleroma_html)
post("/main/ostatus", UtilController, :remote_subscribe)
pipe_through(:pleroma_html)
post("/main/ostatus", UtilController, :remote_subscribe)
- get("/ostatus_subscribe",
UtilController, :remote_
follow)
+ get("/ostatus_subscribe",
RemoteFollowController, :
follow)
- post("/ostatus_subscribe",
UtilController, :do_remote
_follow)
+ post("/ostatus_subscribe",
RemoteFollowController, :do
_follow)
end
scope "/api/pleroma", Pleroma.Web.TwitterAPI do
end
scope "/api/pleroma", Pleroma.Web.TwitterAPI do