projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/wrong-next-key-likes-json' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
router.ex
diff --git
a/lib/pleroma/web/router.ex
b/lib/pleroma/web/router.ex
index 47ee762dcaf9a0f7ffe1a8802bab070fb955fce4..d475fc973759e1a27fb634bc23521d4d6a585a47 100644
(file)
--- a/
lib/pleroma/web/router.ex
+++ b/
lib/pleroma/web/router.ex
@@
-196,6
+196,8
@@
defmodule Pleroma.Web.Router do
get("/config", AdminAPIController, :config_show)
post("/config", AdminAPIController, :config_update)
get("/config", AdminAPIController, :config_show)
post("/config", AdminAPIController, :config_update)
+ get("/config/migrate_to_db", AdminAPIController, :migrate_to_db)
+ get("/config/migrate_from_db", AdminAPIController, :migrate_from_db)
end
scope "/", Pleroma.Web.TwitterAPI do
end
scope "/", Pleroma.Web.TwitterAPI do
@@
-412,6
+414,12
@@
defmodule Pleroma.Web.Router do
get("/accounts/search", SearchController, :account_search)
get("/accounts/search", SearchController, :account_search)
+ post(
+ "/pleroma/accounts/confirmation_resend",
+ MastodonAPIController,
+ :account_confirmation_resend
+ )
+
scope [] do
pipe_through(:oauth_read_or_public)
scope [] do
pipe_through(:oauth_read_or_public)
@@
-692,7
+700,7
@@
defmodule Pleroma.Web.Router do
post("/auth/password", MastodonAPIController, :password_reset)
scope [] do
post("/auth/password", MastodonAPIController, :password_reset)
scope [] do
- pipe_through(:oauth_read
_or_public
)
+ pipe_through(:oauth_read)
get("/web/*path", MastodonAPIController, :index)
end
end
get("/web/*path", MastodonAPIController, :index)
end
end