projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
report_view.ex
diff --git
a/lib/pleroma/web/mastodon_api/views/report_view.ex
b/lib/pleroma/web/mastodon_api/views/report_view.ex
index a16e7ff109d31ee934d2607ff3107d6095531178..9da2dd740053dae3165312bbc1f1c5075cf5705c 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/report_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/report_view.ex
@@
-5,7
+5,7
@@
defmodule Pleroma.Web.MastodonAPI.ReportView do
use Pleroma.Web, :view
- def render("
report
.json", %{activity: activity}) do
+ def render("
show
.json", %{activity: activity}) do
%{
id: to_string(activity.id),
action_taken: false