diff options
| author | kaniini <nenolod@gmail.com> | 2019-06-26 05:34:26 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-06-26 05:34:26 +0000 |
| commit | 24bcc209f9c07c606dda083ff7f8b24ad3606eef (patch) | |
| tree | 736af754f2e4ba009d1cf4b933d36c28d57d52ea | |
| parent | 9f8e645dce1c3b0b2e3b2d1547821241690c5027 (diff) | |
| parent | a7a54068f938d1969b45049cce02fd19731ceab8 (diff) | |
| download | pleroma-24bcc209f9c07c606dda083ff7f8b24ad3606eef.tar.gz | |
Merge branch 'refactoring/fix_render_view' into 'develop'
Fix Controller.render/4 deprecation
See merge request pleroma/pleroma!1337
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index 0c22790f2..9b9eca2a1 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -844,7 +844,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do conn |> put_view(AccountView) - |> render(AccountView, "accounts.json", %{for: user, users: users, as: :user}) + |> render("accounts.json", %{for: user, users: users, as: :user}) else _ -> json(conn, []) end |