Merge pull request #3139 from ClearlyClaire/glitch-soc/backports-4.3

Merge upstream changes up to v4.3.10 into stable-4.3

.github/workflows/build-releases.yml

@@ -20,7 +20,7 @@ jobs:
       # Only tag with latest when ran against the latest stable branch
       # This needs to be updated after each minor version release
       flavor: |
-        latest=${{ startsWith(github.ref, 'refs/tags/v4.3.') }}
+        latest=false
       tags: |
         type=pep440,pattern={{raw}}
         type=pep440,pattern=v{{major}}.{{minor}}
@@ -38,7 +38,7 @@ jobs:
       # Only tag with latest when ran against the latest stable branch
       # This needs to be updated after each minor version release
       flavor: |
-        latest=${{ startsWith(github.ref, 'refs/tags/v4.3.') }}
+        latest=false
       tags: |
         type=pep440,pattern={{raw}}
         type=pep440,pattern=v{{major}}.{{minor}}

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [4.3.10] - 2025-07-23
+
+### Security
+
+- Updated dependencies
+
 ## [4.3.9] - 2025-07-02
 
 ### Changed

Gemfile.lock

@@ -437,7 +437,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2024.0820)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.8)
+    mini_portile2 (2.8.9)
     minitest (5.25.1)
     msgpack (1.7.2)
     multi_json (1.15.0)
@@ -458,7 +458,7 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.3)
-    nokogiri (1.18.8)
+    nokogiri (1.18.9)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oj (3.16.6)
@@ -619,7 +619,7 @@ GEM
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (2.2.13)
+    rack (2.2.17)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-cors (2.0.2)
@@ -840,7 +840,7 @@ GEM
     terrapin (1.0.1)
       climate_control
     test-prof (1.4.2)
-    thor (1.3.2)
+    thor (1.4.0)
     tilt (2.4.0)
     timeout (0.4.3)
     tpm-key_attestation (0.12.1)

SECURITY.md

@@ -15,7 +15,7 @@ A "vulnerability in Mastodon" is a vulnerability in the code distributed through
 
 | Version | Supported        |
 | ------- | ---------------- |
+| 4.4.x   | Yes              |
 | 4.3.x   | Yes              |
-| 4.2.x   | Yes              |
-| 4.1.x   | Until 2025-04-08 |
-| < 4.1   | No               |
+| 4.2.x   | Until 2026-01-08 |
+| < 4.2   | No               |

docker-compose.yml

@@ -59,7 +59,7 @@ services:
   web:
     # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
     # build: .
-    image: ghcr.io/glitch-soc/mastodon:v4.3.9
+    image: ghcr.io/glitch-soc/mastodon:v4.3.10
     restart: always
     env_file: .env.production
     command: bundle exec puma -C config/puma.rb
@@ -83,7 +83,7 @@ services:
     # build:
     #   dockerfile: ./streaming/Dockerfile
     #   context: .
-    image: ghcr.io/glitch-soc/mastodon-streaming:v4.3.9
+    image: ghcr.io/glitch-soc/mastodon-streaming:v4.3.10
     restart: always
     env_file: .env.production
     command: node ./streaming/index.js
@@ -102,7 +102,7 @@ services:
   sidekiq:
     # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
     # build: .
-    image: ghcr.io/glitch-soc/mastodon:v4.3.9
+    image: ghcr.io/glitch-soc/mastodon:v4.3.10
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq

lib/mastodon/version.rb

@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      9
+      10
     end
 
     def default_prerelease