diff options
| author | Ivan Tashkinov <ivant.business@gmail.com> | 2019-04-01 08:49:32 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivant.business@gmail.com> | 2019-04-01 08:49:32 +0300 |
| commit | baffdcc480cea13269ef0e3af58f0a848892bb9a (patch) | |
| tree | a9499083c412b24173fa14717cec7041c6f3f45c /lib/pleroma/web/router.ex | |
| parent | 642075b1a935c42181a10ea695b2289883126136 (diff) | |
| parent | dc39d8d3fb941bad9fe26586c321bb00a0b92fe4 (diff) | |
| download | pleroma-baffdcc480cea13269ef0e3af58f0a848892bb9a.tar.gz | |
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# mix.exs
Diffstat (limited to 'lib/pleroma/web/router.ex')
| -rw-r--r-- | lib/pleroma/web/router.ex | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 4d0e04d9f..8a157e223 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -145,6 +145,7 @@ defmodule Pleroma.Web.Router do pipe_through([:admin_api, :oauth_write]) get("/users", AdminAPIController, :list_users) + get("/users/:nickname", AdminAPIController, :user_show) delete("/user", AdminAPIController, :user_delete) patch("/users/:nickname/toggle_activation", AdminAPIController, :user_toggle_activation) post("/user", AdminAPIController, :user_create) @@ -343,6 +344,7 @@ defmodule Pleroma.Web.Router do get("/instance", MastodonAPIController, :masto_instance) get("/instance/peers", MastodonAPIController, :peers) post("/apps", MastodonAPIController, :create_app) + get("/apps/verify_credentials", MastodonAPIController, :verify_app_credentials) get("/custom_emojis", MastodonAPIController, :custom_emojis) get("/statuses/:id/card", MastodonAPIController, :status_card) |