projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/develop' into restrict-domain
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
controllers
/
media_controller.ex
diff --git
a/lib/pleroma/web/mastodon_api/controllers/media_controller.ex
b/lib/pleroma/web/mastodon_api/controllers/media_controller.ex
index 513de279f0e8c3d5db5f2ab17716f418dc3d4feb..9586b14bc37c906d266e0c58fd41036a64ad5018 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/controllers/media_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/controllers/media_controller.ex
@@
-6,9
+6,9
@@
defmodule Pleroma.Web.MastodonAPI.MediaController do
use Pleroma.Web, :controller
alias Pleroma.Object
use Pleroma.Web, :controller
alias Pleroma.Object
- 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
action_fallback(Pleroma.Web.MastodonAPI.FallbackController)
plug(Pleroma.Web.ApiSpec.CastAndValidate)
action_fallback(Pleroma.Web.MastodonAPI.FallbackController)
plug(Pleroma.Web.ApiSpec.CastAndValidate)