summaryrefslogtreecommitdiff
path: root/changelog.d
diff options
context:
space:
mode:
authorMark Felder <feld@feld.me>2024-08-29 11:01:02 -0400
committerMark Felder <feld@feld.me>2024-08-29 11:01:02 -0400
commitb5814dc9b36850962027abb2e99d64d3084048e6 (patch)
tree0d4656410bb1d037323b47d23b2e605920756fe4 /changelog.d
parent5138a4984ba8cf04e0b6015a7a9253a9013e013e (diff)
parent1e8b79956e0c706650358e8b98c8e04e4fcf05b9 (diff)
downloadpleroma-b5814dc9b36850962027abb2e99d64d3084048e6.tar.gz
pleroma-b5814dc9b36850962027abb2e99d64d3084048e6.zip
Merge remote-tracking branch 'origin/develop' into todo-fixes
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/docs-fix.skip0
-rw-r--r--changelog.d/user-imports.fix1
2 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/docs-fix.skip b/changelog.d/docs-fix.skip
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/changelog.d/docs-fix.skip
diff --git a/changelog.d/user-imports.fix b/changelog.d/user-imports.fix
new file mode 100644
index 000000000..0076c73d7
--- /dev/null
+++ b/changelog.d/user-imports.fix
@@ -0,0 +1 @@
+Imports of blocks, mutes, and follows would retry repeatedly due to incorrect error handling and all work executed in a single job