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
/
pleroma_api_controller.ex
diff --git
a/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
b/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
index b61a6791b2868a90fc99a53d3b3fbdb92ebee43a..e834133b27100724f1cf75c9202bb0f08f8946c0 100644
(file)
--- a/
lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
+++ b/
lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
@@
-73,8
+73,7
@@
defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do
AccountView.render("index.json", %{
users: users,
for: user,
- as: :user,
- skip_relationships: true
+ as: :user
}),
me: !!(user && user.ap_id in user_ap_ids)
}