Merge remote-tracking branch 'origin/develop' into feature/account-export

2020-10-20 17:27:29 +04:00 · 2020-10-20 17:27:29 +04:00 · e87901c424
commit e87901c424
parent ad605e3e16 44b2a137d1
30 changed files with 226 additions and 41 deletions
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@ -31,7 +31,7 @@ defmodule Pleroma.Factory do
      nickname: sequence(:nickname, &"nick#{&1}"),
      password_hash: Pbkdf2.hash_pwd_salt("test"),
      bio: sequence(:bio, &"Tester Number #{&1}"),
-      discoverable: true,
+      is_discoverable: true,
      last_digest_emailed_at: NaiveDateTime.utc_now(),
      last_refreshed_at: NaiveDateTime.utc_now(),
      notification_settings: %Pleroma.User.NotificationSetting{},