projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into issue/1276
[akkoma]
/
lib
/
pleroma
/
web
/
admin_api
/
views
/
status_view.ex
diff --git
a/lib/pleroma/web/admin_api/views/status_view.ex
b/lib/pleroma/web/admin_api/views/status_view.ex
index 6f2b2b09ccd69c6fb168f396247d52c4be74fabe..360ddc22ccf12cdbc6995b465c7c5775fb4ac815 100644
(file)
--- a/
lib/pleroma/web/admin_api/views/status_view.ex
+++ b/
lib/pleroma/web/admin_api/views/status_view.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.StatusView do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.StatusView do
@@
-10,7
+10,7
@@
defmodule Pleroma.Web.AdminAPI.StatusView do
alias Pleroma.User
def render("index.json", opts) do
alias Pleroma.User
def render("index.json", opts) do
- render_many(opts.activities, __MODULE__, "show.json", opts)
+
safe_
render_many(opts.activities, __MODULE__, "show.json", opts)
end
def render("show.json", %{activity: %{data: %{"object" => _object}} = activity} = opts) do
end
def render("show.json", %{activity: %{data: %{"object" => _object}} = activity} = opts) do