diff --git a/CHANGELOG.md b/CHANGELOG.md index 247304182d8..e1a3aa050ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to this project will be documented in this file. +## [4.5.15] - 2026-08-06 + +- Fix typo in embedded quote handling code (#40049 by @shleeable) +- Fix account merging worker incorrectly merging `Appeal` and `AccountWarning` records (#39982 by @shleeable) +- Fix off-by-one in handling of updated remote posts allowing up to 5 attachments (#39978 by @shleeable) + ## [4.5.14] - 2026-07-27 ### Security diff --git a/docker-compose.yml b/docker-compose.yml index b8fc230a01b..ee69cbfc148 100644 --- a/docker-compose.yml +++ b/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/mastodon/mastodon:v4.5.14 + image: ghcr.io/mastodon/mastodon:v4.5.15 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/mastodon/mastodon-streaming:v4.5.14 + image: ghcr.io/mastodon/mastodon-streaming:v4.5.15 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/mastodon/mastodon:v4.5.14 + image: ghcr.io/mastodon/mastodon:v4.5.15 restart: always env_file: .env.production command: bundle exec sidekiq diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index 574cbd4a05d..b43f20a9596 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -13,7 +13,7 @@ module Mastodon end def patch - 14 + 15 end def default_prerelease