Merge branch 'refactor/confirmation_pending_user_field' into 'develop'

Change user.confirmation_pending field to user.is_confirmed

See merge request pleroma/pleroma!3081

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3b792a7f96949449a798e1a9c866009509d159c..ff37d30215737ab18a984a8193bae7b98537aead 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Mastodon API: User and conversation mutes can now auto-expire if `expires_in` parameter was given while adding the mute.
 - Admin API: An endpoint to manage frontends.
 - Streaming API: Add follow relationships updates.
+- WebPush: Introduce `pleroma:chat_mention` and `pleroma:emoji_reaction` notification types
 </details>
 
 ### Fixed
@@ -58,9 +59,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## Unreleased (Patch)
 
 ### Fixed
-
-- Fix ability to update Pleroma Chat push notifications with PUT /api/v1/push/subscription and alert type pleroma:chat_mention
-- Emoji Reaction activity filtering from blocked and muted accounts.
 - StealEmojiPolicy creates dir for emojis, if it doesn't exist.
 
 ## [2.2.1] - 2020-12-22
@@ -77,6 +75,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Rich Media Previews sometimes showed the wrong preview due to a bug following redirects.
 - Fixes for the autolinker.
 - Forwarded reports duplication from Pleroma instances.
+- Emoji Reaction activity filtering from blocked and muted accounts.
 
 - <details>
     <summary>API</summary>

diff --git a/config/config.exs b/config/config.exs
index 7b14fbfe5af3499139c68202d7f407adf9a9ac04..db45f7a3d83aeeac1242f9e8accf50769964b614 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -542,7 +542,7 @@ config :pleroma, Oban,
     scheduled_activities: 10,
     background: 5,
     remote_fetcher: 2,
-    attachments_cleanup: 5,
+    attachments_cleanup: 1,
     new_users_digest: 1,
     mute_expire: 5
   ],