projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
[akkoma]
/
lib
/
pleroma
/
web
/
admin_api
/
admin_api_controller.ex
diff --git
a/lib/pleroma/web/admin_api/admin_api_controller.ex
b/lib/pleroma/web/admin_api/admin_api_controller.ex
index 9f1fd3aeb334f273577a189f460cb55229937096..d2c5a6b9c0d885b65d7fcc32e42e60c3ce8eb956 100644
(file)
--- a/
lib/pleroma/web/admin_api/admin_api_controller.ex
+++ b/
lib/pleroma/web/admin_api/admin_api_controller.ex
@@
-281,7
+281,7
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
conn
|> put_view(Pleroma.Web.AdminAPI.StatusView)
conn
|> put_view(Pleroma.Web.AdminAPI.StatusView)
- |> render("index.json", %{activities: activities, as: :activity
, skip_relationships: false
})
+ |> render("index.json", %{activities: activities, as: :activity})
end
def list_user_statuses(conn, %{"nickname" => nickname} = params) do
end
def list_user_statuses(conn, %{"nickname" => nickname} = params) do
@@
-300,7
+300,7
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
conn
|> put_view(StatusView)
conn
|> put_view(StatusView)
- |> render("index.json", %{activities: activities, as: :activity
, skip_relationships: false
})
+ |> render("index.json", %{activities: activities, as: :activity})
else
_ -> {:error, :not_found}
end
else
_ -> {:error, :not_found}
end
@@
-830,7
+830,7
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
conn
|> put_view(Pleroma.Web.AdminAPI.StatusView)
conn
|> put_view(Pleroma.Web.AdminAPI.StatusView)
- |> render("index.json", %{activities: activities, as: :activity
, skip_relationships: false
})
+ |> render("index.json", %{activities: activities, as: :activity})
end
def status_show(conn, %{"id" => id}) do
end
def status_show(conn, %{"id" => id}) do