summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2019-01-28 11:48:03 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2019-01-28 11:48:03 +0000
commitde0fb88a9cf587b9613e267d5dddfe55b0f414b7 (patch)
treeae7688726e84cdcbf5be5eeff1763af71f10a960
parent74ed1b4d87f5ee5570966179bc6094ac0be09533 (diff)
parentdf2f7b39dd4e4879976fb40b67fa3087e828a6ce (diff)
downloadpleroma-de0fb88a9cf587b9613e267d5dddfe55b0f414b7.tar.gz
pleroma-de0fb88a9cf587b9613e267d5dddfe55b0f414b7.zip
Merge branch 'safe-render-activities' into 'develop'
remove unnecessary filter (re !723) See merge request pleroma/pleroma!729
-rw-r--r--lib/pleroma/web/mastodon_api/views/status_view.ex1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
index 0f2679444..ddfe6788c 100644
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -54,7 +54,6 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
"status.json",
Map.put(opts, :replied_to_activities, replied_to_activities)
)
- |> Enum.filter(fn x -> not is_nil(x) end)
end
def render(