From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Tue, 21 Jan 2020 07:32:27 +0000 (+0300)
Subject: Merge branch 'develop' into admin-be
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=503d966e9f7d4c41a1bfbd215b375443a858564a;p=akkoma

Merge branch 'develop' into admin-be
---

503d966e9f7d4c41a1bfbd215b375443a858564a
diff --cc lib/pleroma/web/admin_api/admin_api_controller.ex
index d45b1f7a7,7118faf94..d5230f9aa
--- a/lib/pleroma/web/admin_api/admin_api_controller.ex
+++ b/lib/pleroma/web/admin_api/admin_api_controller.ex
@@@ -94,9 -99,11 +103,9 @@@ defmodule Pleroma.Web.AdminAPI.AdminAPI
    plug(
      OAuthScopesPlug,
      %{scopes: ["write"], admin: true}
-     when action in [:relay_follow, :relay_unfollow, :config_update]
+     when action == :config_update
    )
  
 -  @users_page_size 50
 -
    action_fallback(:errors)
  
    def user_delete(%{assigns: %{user: admin}} = conn, %{"nickname" => nickname}) do