Merge branch 'develop' into feature/new-registrations-digest
authorEgor Kislitsyn <egor@kislitsyn.com>
Tue, 11 Feb 2020 09:54:55 +0000 (13:54 +0400)
committerEgor Kislitsyn <egor@kislitsyn.com>
Tue, 11 Feb 2020 09:54:55 +0000 (13:54 +0400)
1  2 
CHANGELOG.md
config/config.exs
config/description.exs
config/test.exs
docs/configuration/cheatsheet.md

diff --cc CHANGELOG.md
Simple merge
index 70b3b87a45dc74cd6a28237ae3e0e44bc4b69d42,41c1ff6371a21e56af6a4fdaf45aaf79801096c1..06ae2f2629ba5e04d6e4c5ed747b193802ae1251
@@@ -501,11 -480,13 +480,15 @@@ config :pleroma, Oban
      transmogrifier: 20,
      scheduled_activities: 10,
      background: 5,
 -    attachments_cleanup: 5
 +    attachments_cleanup: 5,
 +    new_users_digest: 1
    ],
    crontab: [
 -    {"0 0 * * 0", Pleroma.Workers.Cron.DigestEmailsWorker}
+     {"0 0 * * *", Pleroma.Workers.Cron.ClearOauthTokenWorker},
+     {"0 * * * *", Pleroma.Workers.Cron.StatsWorker},
+     {"* * * * *", Pleroma.Workers.Cron.PurgeExpiredActivitiesWorker},
++    {"0 0 * * 0", Pleroma.Workers.Cron.DigestEmailsWorker},
 +    {"0 0 * * *", Pleroma.Workers.NewUsersDigestWorker}
    ]
  
  config :pleroma, :workers,
Simple merge
diff --cc config/test.exs
Simple merge
Simple merge