Merge branch 'develop' into issue/1342

2019-12-05 15:46:27 +03:00 · 2019-12-05 15:46:27 +03:00 · 3fe7a1fd35
commit 3fe7a1fd35
parent a36607c27e 228bf4d214
36 changed files with 563 additions and 84 deletions
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@ -31,7 +31,6 @@ defmodule Pleroma.Factory do
      nickname: sequence(:nickname, &"nick#{&1}"),
      password_hash: Comeonin.Pbkdf2.hashpwsalt("test"),
      bio: sequence(:bio, &"Tester Number #{&1}"),
-      info: %{},
      last_digest_emailed_at: NaiveDateTime.utc_now(),
      notification_settings: %Pleroma.User.NotificationSetting{}
    }