From 547634dfa64a59012f37b60a6dd830bc4be76be4 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 16 Mar 2023 22:39:45 +0100
Subject: [PATCH] Bump version to v3.5.7

---
 CHANGELOG.md            | 7 ++++++-
 docker-compose.yml      | 6 +++---
 lib/mastodon/version.rb | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83e651ff156..3346e7b3164 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@ Changelog
 
 All notable changes to this project will be documented in this file.
 
-# [3.5.7] - UNRELEASED
+# [3.5.7] - 2023-03-16
 
 ### Added
 
@@ -27,6 +27,11 @@ All notable changes to this project will be documented in this file.
 - Fix incorrect post links in strikes when the account is remote ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/23611))
 - Fix misleading error code when receiving invalid WebAuthn credentials ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/23568))
 
+### Security
+
+- Change user backups to use expiring URLs for download when possible ([Gargron](https://github.com/mastodon/mastodon/pull/24136))
+- Add warning for object storage misconfiguration ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/24137))
+
 ## [3.5.6] - 2023-02-09
 ### Fixed
 
diff --git a/docker-compose.yml b/docker-compose.yml
index e4a862c11bc..165f26a68d9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -44,7 +44,7 @@ services:
 
   web:
     build: .
-    image: ghcr.io/mastodon/mastodon:v3.5.5
+    image: ghcr.io/mastodon/mastodon:v3.5.7
     restart: always
     env_file: .env.production
     command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"
@@ -65,7 +65,7 @@ services:
 
   streaming:
     build: .
-    image: ghcr.io/mastodon/mastodon:v3.5.5
+    image: ghcr.io/mastodon/mastodon:v3.5.7
     restart: always
     env_file: .env.production
     command: node ./streaming
@@ -83,7 +83,7 @@ services:
 
   sidekiq:
     build: .
-    image: ghcr.io/mastodon/mastodon:v3.5.5
+    image: ghcr.io/mastodon/mastodon:v3.5.7
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 81fdf98caea..26ad167cdc3 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      6
+      7
     end
 
     def flags