diff options
| author | Roman Chvanikov <chvanikoff@gmail.com> | 2019-04-19 23:27:13 +0700 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@gmail.com> | 2019-04-19 23:27:13 +0700 |
| commit | 73407f4eea7793c93981a87bb7eddef4f8daab7c (patch) | |
| tree | 31dd745ec9cd8adf57bde7f3e6a2ffd9be3289ae /lib/pleroma/web/router.ex | |
| parent | bc7862106d9881f858a58319e9e4b44cba1bcf01 (diff) | |
| parent | cc93775ebf539598075c0b9afb96c60c8bede6b5 (diff) | |
| download | pleroma-73407f4eea7793c93981a87bb7eddef4f8daab7c.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
Diffstat (limited to 'lib/pleroma/web/router.ex')
| -rw-r--r-- | lib/pleroma/web/router.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index a809347be..8b665d61b 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -242,7 +242,6 @@ defmodule Pleroma.Web.Router do get("/accounts/verify_credentials", MastodonAPIController, :verify_credentials) get("/accounts/relationships", MastodonAPIController, :relationships) - get("/accounts/search", MastodonAPIController, :account_search) get("/accounts/:id/lists", MastodonAPIController, :account_lists) get("/accounts/:id/identity_proofs", MastodonAPIController, :empty_array) @@ -377,6 +376,8 @@ defmodule Pleroma.Web.Router do get("/trends", MastodonAPIController, :empty_array) + get("/accounts/search", MastodonAPIController, :account_search) + scope [] do pipe_through(:oauth_read_or_unauthenticated) |