From: minibikini <egor@kislitsyn.com>
Date: Thu, 4 Jun 2020 13:29:32 +0000 (+0000)
Subject: Merge branch 'develop' into 'openapi/admin/relay'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=b57e4ad1abd6fa0c0597b4343528e211c84b50c1;p=akkoma

Merge branch 'develop' into 'openapi/admin/relay'

# Conflicts:
#   lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
---

b57e4ad1abd6fa0c0597b4343528e211c84b50c1
diff --cc lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
index b7fcd4bbf,bf24581cc..17eb4533f
--- a/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
+++ b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
@@@ -17,9 -16,9 +16,8 @@@ defmodule Pleroma.Web.AdminAPI.AdminAPI
    alias Pleroma.Web.ActivityPub.ActivityPub
    alias Pleroma.Web.ActivityPub.Builder
    alias Pleroma.Web.ActivityPub.Pipeline
 -  alias Pleroma.Web.ActivityPub.Relay
    alias Pleroma.Web.AdminAPI
    alias Pleroma.Web.AdminAPI.AccountView
-   alias Pleroma.Web.AdminAPI.ConfigView
    alias Pleroma.Web.AdminAPI.ModerationLogView
    alias Pleroma.Web.AdminAPI.Search
    alias Pleroma.Web.Endpoint
@@@ -74,10 -72,9 +71,8 @@@
      OAuthScopesPlug,
      %{scopes: ["read"], admin: true}
      when action in [
-            :config_show,
             :list_log,
             :stats,
-            :config_descriptions,
 -           :relay_list,
             :need_reboot
           ]
    )