Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations

# Conflicts: # lib/pleroma/user.ex
2019-12-04 18:56:31 +03:00 · 2019-12-04 18:56:31 +03:00 · 30caf3e51e
commit 30caf3e51e
parent 52cc7de82c 228bf4d214
35 changed files with 510 additions and 82 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()
    }