Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances

# Conflicts: # lib/pleroma/web/feed/user_controller.ex # lib/pleroma/web/o_status/o_status_controller.ex # lib/pleroma/web/router.ex # lib/pleroma/web/static_fe/static_fe_controller.ex
2020-10-17 13:12:39 +03:00 · 2020-10-17 13:12:39 +03:00 · 049ece1ef3
commit 049ece1ef3
parent 2498e569f1 023f726d7f
677 changed files with 1669 additions and 800 deletions
--- a/test/support/captcha/mock.ex
+++ b/test/support/captcha/mock.ex
--- 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{},