hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into refactor/deactivated_user_field

Browse source
This commit is contained in:
Mark Felder 2021-01-18 14:58:21 -06:00
commit 28581e03ad
107 changed files with 278 additions and 242 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/pleroma/web/plugs/user_enabled_plug_test.exs
View file

@ -22,7 +22,7 @@ defmodule Pleroma.Web.Plugs.UserEnabledPlugTest do
%{conn: conn} do
Pleroma.Config.put([:instance, :account_activation_required], true)
user = insert(:user, confirmation_pending: true)
user = insert(:user, is_confirmed: false)
conn =
conn