Merge branch 'feature/digest-email' into 'develop'

Feature/digest email See merge request pleroma/pleroma!1078
2019-08-08 14:38:33 +00:00 · 2019-08-08 14:38:33 +00:00 · 29807ef6a5
commit 29807ef6a5
parent b18234e04c 9d4f34fbcb
33 changed files with 658 additions and 17 deletions
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@ -31,7 +31,8 @@ defmodule Pleroma.Factory do
      nickname: sequence(:nickname, &"nick#{&1}"),
      password_hash: Comeonin.Pbkdf2.hashpwsalt("test"),
      bio: sequence(:bio, &"Tester Number #{&1}"),
-      info: %{}
+      info: %{},
+      last_digest_emailed_at: NaiveDateTime.utc_now()
    }

    %{