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

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

diff --cc lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
index b7fcd4bbf12380da294d11f9ef85d3782c993cdb,bf24581ccc8c0966e64b1da1319e554f96516dcf..17eb4533f6a8f94a29bab7502696262f2b6bf5a9
--- 1/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
--- 2/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
           ]
    )

diff --cc lib/pleroma/web/router.ex
Simple merge

diff --cc test/web/admin_api/controllers/admin_api_controller_test.exs
Simple merge