Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance

2019-11-25 01:43:11 +09:00 · 2019-11-25 01:43:11 +09:00 · fd24467b92
commit fd24467b92
parent 114930b5fd 937d6c6b32
32 changed files with 411 additions and 59 deletions
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@ -13,6 +13,7 @@ defmodule Pleroma.Web.Router do
  pipeline :oauth do
    plug(:fetch_session)
    plug(Pleroma.Plugs.OAuthPlug)
+    plug(Pleroma.Plugs.UserEnabledPlug)
  end

  pipeline :api do