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 'pleroma/develop' into cycles-html
[akkoma]
/
lib
/
pleroma
/
web
/
pleroma_api
/
controllers
/
emoji_pack_controller.ex
diff --git
a/lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex
b/lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex
index bc4c8d84061afff263e8f91ef1e98a1e7dd315e4..d0f677d3c5cfc1dfba99e3ffc719456639ce9ae4 100644
(file)
--- a/
lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex
+++ b/
lib/pleroma/web/pleroma_api/controllers/emoji_pack_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.PleromaAPI.EmojiPackController do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.PleromaAPI.EmojiPackController do
@@
-11,7
+11,7
@@
defmodule Pleroma.Web.PleromaAPI.EmojiPackController do
plug(
Pleroma.Web.Plugs.OAuthScopesPlug,
plug(
Pleroma.Web.Plugs.OAuthScopesPlug,
- %{scopes: ["
write"], admin: true
}
+ %{scopes: ["
admin:write"]
}
when action in [
:import_from_filesystem,
:remote,
when action in [
:import_from_filesystem,
:remote,