From 22b957d47b3b532aee5c4cd5e0a496a80a9707e6 Mon Sep 17 00:00:00 2001 From: Claire Date: Tue, 23 Sep 2025 11:39:35 +0200 Subject: [PATCH] Bump version to v4.2.26 --- CHANGELOG.md | 11 +++++++++++ docker-compose.yml | 6 +++--- lib/mastodon/version.rb | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82ed72fdfe..99101b2138 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,17 @@ All notable changes to this project will be documented in this file. +## [4.2.26] - 2025-09-23 + +### Security + +- Update dependencies + +### Fixed + +- Fix processing of out-of-order `Update` as implicit updates (#36190 by @ClearlyClaire) +- Fix getting `Create` and `Update` out of order (#36176 by @ClearlyClaire) + ## [4.2.25] - 2025-09-16 ### Fixed diff --git a/docker-compose.yml b/docker-compose.yml index 81c3477c7b..bfa443d724 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -56,7 +56,7 @@ services: web: build: . - image: ghcr.io/mastodon/mastodon:v4.2.25 + image: ghcr.io/mastodon/mastodon:v4.2.26 restart: always env_file: .env.production command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000" @@ -77,7 +77,7 @@ services: streaming: build: . - image: ghcr.io/mastodon/mastodon:v4.2.25 + image: ghcr.io/mastodon/mastodon:v4.2.26 restart: always env_file: .env.production command: node ./streaming @@ -95,7 +95,7 @@ services: sidekiq: build: . - image: ghcr.io/mastodon/mastodon:v4.2.25 + image: ghcr.io/mastodon/mastodon:v4.2.26 restart: always env_file: .env.production command: bundle exec sidekiq diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index 50fc54afa1..3acabcfbdd 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -13,7 +13,7 @@ module Mastodon end def patch - 25 + 26 end def default_prerelease