Merge branch 'bugfix/status-search-fallback' into 'develop'

Activity.Search: resolve status on DB Timeout Closes #2566 See merge request pleroma/pleroma!3507
2021-08-13 12:09:39 +00:00 · 2021-08-13 12:09:39 +00:00 · 7afabe1cc6
commit 7afabe1cc6
parent 3a7b54be4a 6455b967ec
2 changed files with 20 additions and 13 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -15,6 +15,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

 ### Removed

+## Unreleased-patch
+- Mastodon API: Activity Search fallbacks on status fetching after a DB Timeout/Error
+
 ## 2.4.0 - 2021-08-xx

 ### Changed