diff options
| author | kaniini <nenolod@gmail.com> | 2019-03-14 02:01:10 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-03-14 02:01:10 +0000 |
| commit | 59333f2d568dc6e50fb72e5114ec7dd6bcc1ebef (patch) | |
| tree | 4b65347a97f158d3e1e6ee21074e8480a97ff536 /lib | |
| parent | 86871c8a04e8667dc86e9ef372701109ed853d00 (diff) | |
| parent | cc0f2f8ba3f8a8f2909722d34d95523218536267 (diff) | |
| download | pleroma-59333f2d568dc6e50fb72e5114ec7dd6bcc1ebef.tar.gz | |
Merge branch 'admin-api-account-view-namespace' into 'develop'
MastodonAPI.Admin.AccountView → AdminAPI.AccountView
See merge request pleroma/pleroma!930
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/admin_api/admin_api_controller.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/admin_api/views/account_view.ex (renamed from lib/pleroma/web/mastodon_api/views/admin/account_view.ex) | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex index 75c2c6061..6d9bf2895 100644 --- a/lib/pleroma/web/admin_api/admin_api_controller.ex +++ b/lib/pleroma/web/admin_api/admin_api_controller.ex @@ -8,7 +8,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do use Pleroma.Web, :controller alias Pleroma.User alias Pleroma.Web.ActivityPub.Relay - alias Pleroma.Web.MastodonAPI.Admin.AccountView + alias Pleroma.Web.AdminAPI.AccountView import Pleroma.Web.ControllerHelper, only: [json_response: 3] diff --git a/lib/pleroma/web/mastodon_api/views/admin/account_view.ex b/lib/pleroma/web/admin_api/views/account_view.ex index 787b049a3..4d6f921ef 100644 --- a/lib/pleroma/web/mastodon_api/views/admin/account_view.ex +++ b/lib/pleroma/web/admin_api/views/account_view.ex @@ -2,11 +2,11 @@ # Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only -defmodule Pleroma.Web.MastodonAPI.Admin.AccountView do +defmodule Pleroma.Web.AdminAPI.AccountView do use Pleroma.Web, :view alias Pleroma.User.Info - alias Pleroma.Web.MastodonAPI.Admin.AccountView + alias Pleroma.Web.AdminAPI.AccountView def render("index.json", %{users: users, count: count, page_size: page_size}) do %{ |