projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'stable' into release/2.0.0
[akkoma]
/
lib
/
pleroma
/
web
/
pleroma_api
/
controllers
/
emoji_api_controller.ex
diff --git
a/lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex
b/lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex
index a2f6d2287f5a4f2966f2977532f979e0c22ba9d0..03e95e0202fa7454705c24f2a3ec6c4ae7ec91cd 100644
(file)
--- a/
lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex
+++ b/
lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex
@@
-323,7
+323,7
@@
keeping it in cache for #{div(cache_ms, 1000)}s")
{:ok, _} ->
conn |> json("ok")
- {:error, _} ->
+ {:error, _
, _
} ->
conn
|> put_status(:internal_server_error)
|> json(%{error: "Couldn't delete the pack #{name}"})