projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
[akkoma]
/
lib
/
pleroma
/
web
/
pleroma_api
/
controllers
/
account_controller.ex
diff --git
a/lib/pleroma/web/pleroma_api/controllers/account_controller.ex
b/lib/pleroma/web/pleroma_api/controllers/account_controller.ex
index 07078d41572bf84752ae531e31cd632ac82e6fea..0a3f45620581558c01c2378cad3f125671d8d96e 100644
(file)
--- 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,
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
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,
|> render("index.json",
activities: activities,
for: for_user,
- as: :activity,
- skip_relationships: skip_relationships?(params)
+ as: :activity
)
end
)
end