diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-28 10:32:03 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-28 10:36:04 +0300 |
| commit | 1053319cd64a0eab40fab6dc9ce3a1b78711069b (patch) | |
| tree | 3d613f7c6129f667ea16aedfe46259d9ca6bde29 /lib/pleroma/web/admin_api | |
| parent | 73ae38ca04df02656bfb239ceba4ffe64879e927 (diff) | |
| parent | 50ab06435353144582f6afbf37402aef13c2b3f1 (diff) | |
| download | pleroma-1053319cd64a0eab40fab6dc9ce3a1b78711069b.tar.gz | |
Merge branch 'develop' into tests/mastodon_api_controller.ex
Diffstat (limited to 'lib/pleroma/web/admin_api')
| -rw-r--r-- | lib/pleroma/web/admin_api/admin_api_controller.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex index 90aef99f7..21da8a7ff 100644 --- a/lib/pleroma/web/admin_api/admin_api_controller.ex +++ b/lib/pleroma/web/admin_api/admin_api_controller.ex @@ -513,7 +513,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do conn |> put_view(StatusView) - |> render("status.json", %{activity: activity}) + |> render("show.json", %{activity: activity}) else true -> {:param_cast, nil} @@ -537,7 +537,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do conn |> put_view(StatusView) - |> render("status.json", %{activity: activity}) + |> render("show.json", %{activity: activity}) end end |