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 'remotes/origin/develop' into 2301-users-search-discover...
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
controllers
/
mastodon_api_controller.ex
diff --git
a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
index e7767de4eca50536d26f7f54a310ce54771cfc86..9cf682c7b8a5dd163b35701ef805c2c8d927fffd 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
@@
-17,7
+17,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
plug(
:skip_plug,
- [Pleroma.
Plugs.OAuthScopesPlug, Pleroma
.Plugs.EnsurePublicOrAuthenticatedPlug]
+ [Pleroma.
Web.Plugs.OAuthScopesPlug, Pleroma.Web
.Plugs.EnsurePublicOrAuthenticatedPlug]
when action in [:empty_array, :empty_object]
)