pleroma

commit: d28d88766bc0ec98e391eed0402e35280c384c8c
parent: 12c2b3b831fa8db6e6f77463544644388f84444e
Author: lain <lain@soykaf.club>
Date:   Wed,  3 Jun 2020 11:28:56 +0000

Merge branch 'admin-api/account-view' into 'develop'

Use AdminAPI.StatusView in api/admin/users

Closes #1836

See merge request pleroma/pleroma!2627
Diffstat:
M
lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
3
+--

1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
@@ -30,7 +30,6 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
   alias Pleroma.Web.AdminAPI.Search
   alias Pleroma.Web.CommonAPI
   alias Pleroma.Web.Endpoint
-  alias Pleroma.Web.MastodonAPI
   alias Pleroma.Web.Router
 
   require Logger
@@ -279,7 +278,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
         })
 
       conn
-      |> put_view(MastodonAPI.StatusView)
+      |> put_view(AdminAPI.StatusView)
       |> render("index.json", %{activities: activities, as: :activity})
     else
       _ -> {:error, :not_found}