projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'issue/2069' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
controllers
/
follow_request_controller.ex
diff --git
a/lib/pleroma/web/mastodon_api/controllers/follow_request_controller.ex
b/lib/pleroma/web/mastodon_api/controllers/follow_request_controller.ex
index 748b6b4757ff704b79c125c10b2bd4dfff956689..f8cd7fa9f9aee771ca771bd10ae51a98571caf29 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/controllers/follow_request_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/controllers/follow_request_controller.ex
@@
-5,9
+5,9
@@
defmodule Pleroma.Web.MastodonAPI.FollowRequestController do
use Pleroma.Web, :controller
defmodule Pleroma.Web.MastodonAPI.FollowRequestController do
use Pleroma.Web, :controller
- alias Pleroma.Plugs.OAuthScopesPlug
alias Pleroma.User
alias Pleroma.Web.CommonAPI
alias Pleroma.User
alias Pleroma.Web.CommonAPI
+ alias Pleroma.Web.Plugs.OAuthScopesPlug
plug(:put_view, Pleroma.Web.MastodonAPI.AccountView)
plug(Pleroma.Web.ApiSpec.CastAndValidate)
plug(:put_view, Pleroma.Web.MastodonAPI.AccountView)
plug(Pleroma.Web.ApiSpec.CastAndValidate)