From: Sean King <seanking2919@protonmail.com>
Date: Fri, 6 Aug 2021 14:08:20 +0000 (-0600)
Subject: Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=1841bd8383d7734cb74cff91f61dc7e1fdfad13d;p=akkoma

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe
---

1841bd8383d7734cb74cff91f61dc7e1fdfad13d
diff --cc lib/pleroma/web/router.ex
index 9695667b6,74ee23c06..1f84750b9
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -100,6 -100,16 +100,10 @@@ defmodule Pleroma.Web.Router d
      plug(Pleroma.Web.Plugs.IdempotencyPlug)
    end
  
+   pipeline :require_admin do
+     plug(Pleroma.Web.Plugs.UserIsAdminPlug)
+   end
+ 
 -  pipeline :mastodon_html do
 -    plug(:browser)
 -    plug(:authenticate)
 -    plug(:after_auth)
 -  end
 -
    pipeline :pleroma_html do
      plug(:browser)
      plug(:authenticate)