From a3d31ffc1ead2abe98a8b722b406a7574a14a915 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 28 Jul 2023 10:07:57 +0200
Subject: [PATCH] Bump version to v3.5.12

---
 .github/workflows/build-image.yml | 2 +-
 CHANGELOG.md                      | 7 +++++++
 docker-compose.yml                | 6 +++---
 lib/mastodon/version.rb           | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 2440b9ae70..e1683377ee 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -45,7 +45,7 @@ jobs:
             tootsuite/mastodon
             ghcr.io/mastodon/mastodon
           flavor: |
-            latest=auto
+            latest=false
           tags: |
             type=edge,branch=main
             type=match,pattern=v(.*),group=0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f99c2b6b1f..01a67667ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ Changelog
 
 All notable changes to this project will be documented in this file.
 
+## [3.5.12] - 2023-07-31
+
+### Fixed
+
+- Fix memory leak in streaming server ([ThisIsMissEm](https://github.com/mastodon/mastodon/pull/26228))
+- Fix incorrect connect timeout in outgoing requests ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/26116))
+
 ## [3.5.11] - 2023-07-21
 
 ### Added
diff --git a/docker-compose.yml b/docker-compose.yml
index 7d32c125c8..0db8753f2a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -44,7 +44,7 @@ services:
 
   web:
     build: .
-    image: ghcr.io/mastodon/mastodon:v3.5.11
+    image: ghcr.io/mastodon/mastodon:v3.5.12
     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.11
+    image: ghcr.io/mastodon/mastodon:v3.5.12
     restart: always
     env_file: .env.production
     command: node ./streaming
@@ -83,7 +83,7 @@ services:
 
   sidekiq:
     build: .
-    image: ghcr.io/mastodon/mastodon:v3.5.11
+    image: ghcr.io/mastodon/mastodon:v3.5.12
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 624e8e9fe3..af695330a1 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      11
+      12
     end
 
     def flags