From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Thu, 20 Feb 2020 12:00:48 +0000 (+0300)
Subject: Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=0c65a8c3d02a5a9dc3a0a54fef3b86130cf3c0dd;p=akkoma

Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation

# Conflicts:
#	config/config.exs
---

0c65a8c3d02a5a9dc3a0a54fef3b86130cf3c0dd
diff --cc CHANGELOG.md
index bdd6ec432,ce0f584cb..e0ab69d8b
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -72,8 -72,8 +72,9 @@@ The format is based on [Keep a Changelo
  - User notification settings: Add `privacy_option` option.
  - Support for custom Elixir modules (such as MRF policies)
  - User settings: Add _This account is a_ option.
+ - A new users admin digest email
  - OAuth: admin scopes support (relevant setting: `[:auth, :enforce_oauth_admin_scope_usage]`).
 +- ActivityPub: support for `replies` collection (output for outgoing federation & fetching on incoming federation).
  <details>
    <summary>API Changes</summary>
  
diff --cc config/config.exs
index cb1551c2a,664572cf3..47b53d5af
--- a/config/config.exs
+++ b/config/config.exs
@@@ -481,8 -480,8 +481,9 @@@ config :pleroma, Oban
      transmogrifier: 20,
      scheduled_activities: 10,
      background: 5,
 -    attachments_cleanup: 5,
 +    remote_fetcher: 2,
 +    attachments_cleanup: 5
+     new_users_digest: 1
    ],
    crontab: [
      {"0 0 * * *", Pleroma.Workers.Cron.ClearOauthTokenWorker},