Merge branch 'bugfix/1395-email-activation' into 'develop'

Bugfix/1395 email activation Closes #1395 See merge request pleroma/pleroma!1965
2019-11-15 14:11:48 +00:00 · 2019-11-15 14:11:48 +00:00 · 22554ac5ca
commit 22554ac5ca
parent 13b6aefd59 f17e0f8e4f
6 changed files with 36 additions and 4 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