Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11

2020-10-17 17:53:47 +03:00 · 2020-10-17 17:53:47 +03:00 · 9ea31b373f
commit 9ea31b373f
parent a859d9bc15 023f726d7f
85 changed files with 393 additions and 314 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{},