projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request 'Update OpenBSD docs' (#414) from lechindianer/akkoma:update-openb...
[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 f8cd7fa9f9aee771ca771bd10ae51a98571caf29..d915298f11824c9ed51c7d4e660c87c5e61540a4 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/controllers/follow_request_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/controllers/follow_request_controller.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.FollowRequestController do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.FollowRequestController do
@@
-9,7
+9,6
@@
defmodule Pleroma.Web.MastodonAPI.FollowRequestController do
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.Plugs.OAuthScopesPlug
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.Plugs.OAuthScopesPlug
- plug(:put_view, Pleroma.Web.MastodonAPI.AccountView)
plug(Pleroma.Web.ApiSpec.CastAndValidate)
plug(:assign_follower when action != :index)
plug(Pleroma.Web.ApiSpec.CastAndValidate)
plug(:assign_follower when action != :index)