From 0f3a40c39e6c0ee3d3aba38fbabb6a0517c88aa1 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 29 Jan 2024 17:22:33 +0100
Subject: [PATCH] Bump version to v3.5.17

---
 CHANGELOG.md            | 8 +++++++-
 SECURITY.md             | 2 +-
 docker-compose.yml      | 6 +++---
 lib/mastodon/version.rb | 2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90583d5e5..d7540c5c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,9 +5,15 @@ All notable changes to this project will be documented in this file.
 
 ## End of life notice
 
-**The 3.5.x branch will not receive any update after 2023-12-31.**
+**The 3.5.x branch has reached its end of life and will not receive any further update.**
 This means that no security fix will be made available for this branch after this date, and you will need to update to a more recent version (such as the 4.2.x branch) to receive security fixes.
 
+## [3.5.17] - 2024-02-01
+
+### Security
+
+- Fix TODO
+
 ## [3.5.16] - 2023-12-04
 
 ### Changed
diff --git a/SECURITY.md b/SECURITY.md
index a4c76fabf..1b46ac8c5 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -15,5 +15,5 @@ A "vulnerability in Mastodon" is a vulnerability in the code distributed through
 | 4.2.x   | Yes              |
 | 4.1.x   | Yes              |
 | 4.0.x   | No               |
-| 3.5.x   | Until 2023-12-31 |
+| 3.5.x   | No               |
 | < 3.5   | No               |
diff --git a/docker-compose.yml b/docker-compose.yml
index 08f6dcd7e..eee6a48b2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -44,7 +44,7 @@ services:
 
   web:
     build: .
-    image: ghcr.io/mastodon/mastodon:v3.5.16
+    image: ghcr.io/mastodon/mastodon:v3.5.17
     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.16
+    image: ghcr.io/mastodon/mastodon:v3.5.17
     restart: always
     env_file: .env.production
     command: node ./streaming
@@ -83,7 +83,7 @@ services:
 
   sidekiq:
     build: .
-    image: ghcr.io/mastodon/mastodon:v3.5.16
+    image: ghcr.io/mastodon/mastodon:v3.5.17
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 3355a5197..8ddf5728d 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      16
+      17
     end
 
     def flags