From 16e47e1aae55c0ead7207030ad8a554c18ff1250 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 5 Sep 2023 15:30:24 +0200
Subject: [PATCH] Bump version to v3.5.13

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01a67667ea..4172480f51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,23 @@ Changelog
 
 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.**
+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.1.x branch) to receive security fixes.
+
+## [3.5.13] - 2023-09-05
+
+### Changed
+
+- Change remote report processing to accept reports with long comments, but truncate them ([ThisIsMissEm](https://github.com/mastodon/mastodon/pull/25028))
+
+### Fixed
+
+- **Fix blocking subdomains of an already-blocked domain** ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/26392))
+- Fix `/api/v1/timelines/tag/:hashtag` allowing for unauthenticated access when public preview is disabled ([danielmbrasil](https://github.com/mastodon/mastodon/pull/26237))
+- Fix inefficiencies in `PlainTextFormatter` ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/26727))
+
 ## [3.5.12] - 2023-07-31
 
 ### Fixed
diff --git a/SECURITY.md b/SECURITY.md
index 62e23f7360..f6c92567bb 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -12,8 +12,8 @@ A "vulnerability in Mastodon" is a vulnerability in the code distributed through
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 3.5.x   | Yes                |
-| 3.4.x   | Yes                |
+| 3.5.x   | Until 2023-12-31   |
+| 3.4.x   | No                 |
 | 3.3.x   | No                 |
 | < 3.3   | No                 |
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 0db8753f2a..db72009a73 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -44,7 +44,7 @@ services:
 
   web:
     build: .
-    image: ghcr.io/mastodon/mastodon:v3.5.12
+    image: ghcr.io/mastodon/mastodon:v3.5.13
     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.12
+    image: ghcr.io/mastodon/mastodon:v3.5.13
     restart: always
     env_file: .env.production
     command: node ./streaming
@@ -83,7 +83,7 @@ services:
 
   sidekiq:
     build: .
-    image: ghcr.io/mastodon/mastodon:v3.5.12
+    image: ghcr.io/mastodon/mastodon:v3.5.13
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index af695330a1..fa32026ebb 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      12
+      13
     end
 
     def flags