Merge branch 'refactoring/fix_render_view' into 'develop'

Fix Controller.render/4 deprecation

See merge request pleroma/pleroma!1337
This commit is contained in:
kaniini 2019-06-26 05:34:26 +00:00
commit 24bcc209f9

View file

@ -844,7 +844,7 @@ def favourited_by(%{assigns: %{user: user}} = conn, %{"id" => id}) do
conn conn
|> put_view(AccountView) |> put_view(AccountView)
|> render(AccountView, "accounts.json", %{for: user, users: users, as: :user}) |> render("accounts.json", %{for: user, users: users, as: :user})
else else
_ -> json(conn, []) _ -> json(conn, [])
end end