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 registration-workflow
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
controllers
/
custom_emoji_controller.ex
diff --git
a/lib/pleroma/web/mastodon_api/controllers/custom_emoji_controller.ex
b/lib/pleroma/web/mastodon_api/controllers/custom_emoji_controller.ex
index c5f47c5dffc77e3cc3997edbdbfb06767601a0bb..872cb1f4de04986f2e0e2d6db15e57d9dca783b5 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/controllers/custom_emoji_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/controllers/custom_emoji_controller.ex
@@
-9,7
+9,7
@@
defmodule Pleroma.Web.MastodonAPI.CustomEmojiController do
plug(
:skip_plug,
- [Pleroma.
Plugs.OAuthScopesPlug, Pleroma
.Plugs.EnsurePublicOrAuthenticatedPlug]
+ [Pleroma.
Web.Plugs.OAuthScopesPlug, Pleroma.Web
.Plugs.EnsurePublicOrAuthenticatedPlug]
when action == :index
)