diff options
| author | lain <lain@soykaf.club> | 2020-05-17 12:14:49 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-17 12:14:49 +0200 |
| commit | 9c171097653abce49b9847fff66bc39b35719a1c (patch) | |
| tree | e89ab9245f0844bfb3334f62f67f8ab9f0949580 /lib/pleroma/web/pleroma_api/controllers/account_controller.ex | |
| parent | f012c3a202ef43d1a8a1dc88f08057b7a41d3d78 (diff) | |
| parent | b0ccdb5af4baa119b336298d38f34746cdce0111 (diff) | |
| download | pleroma-9c171097653abce49b9847fff66bc39b35719a1c.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
Diffstat (limited to 'lib/pleroma/web/pleroma_api/controllers/account_controller.ex')
| -rw-r--r-- | lib/pleroma/web/pleroma_api/controllers/account_controller.ex | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/pleroma/web/pleroma_api/controllers/account_controller.ex b/lib/pleroma/web/pleroma_api/controllers/account_controller.ex index 07078d415..0a3f45620 100644 --- a/lib/pleroma/web/pleroma_api/controllers/account_controller.ex +++ b/lib/pleroma/web/pleroma_api/controllers/account_controller.ex @@ -6,7 +6,7 @@ defmodule Pleroma.Web.PleromaAPI.AccountController do use Pleroma.Web, :controller import Pleroma.Web.ControllerHelper, - only: [json_response: 3, add_link_headers: 2, assign_account_by_id: 2, skip_relationships?: 1] + only: [json_response: 3, add_link_headers: 2, assign_account_by_id: 2] alias Ecto.Changeset alias Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug @@ -149,8 +149,7 @@ defmodule Pleroma.Web.PleromaAPI.AccountController do |> render("index.json", activities: activities, for: for_user, - as: :activity, - skip_relationships: skip_relationships?(params) + as: :activity ) end |