projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
lib
/
pleroma
/
web
/
pleroma_api
/
controllers
/
mascot_controller.ex
diff --git
a/lib/pleroma/web/pleroma_api/controllers/mascot_controller.ex
b/lib/pleroma/web/pleroma_api/controllers/mascot_controller.ex
index 7e2f6c3284d9b53964213f47b0008ce5f181ebef..15210f1e65d4f4373d28876872eb8adf40bcb6b0 100644
(file)
--- a/
lib/pleroma/web/pleroma_api/controllers/mascot_controller.ex
+++ b/
lib/pleroma/web/pleroma_api/controllers/mascot_controller.ex
@@
-5,9
+5,9
@@
defmodule Pleroma.Web.PleromaAPI.MascotController do
use Pleroma.Web, :controller
defmodule Pleroma.Web.PleromaAPI.MascotController do
use Pleroma.Web, :controller
- alias Pleroma.Plugs.OAuthScopesPlug
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
+ alias Pleroma.Web.Plugs.OAuthScopesPlug
plug(Majic.Plug, [pool: Pleroma.MajicPool] when action in [:update])
plug(Pleroma.Web.ApiSpec.CastAndValidate)
plug(Majic.Plug, [pool: Pleroma.MajicPool] when action in [:update])
plug(Pleroma.Web.ApiSpec.CastAndValidate)