diff --git a/CHANGELOG.md b/CHANGELOG.md index c4fa9b6a4d..04334be9a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,18 @@ Changelog All notable changes to this project will be documented in this file. -## [4.2.21] - 2024-12-03 +## [4.1.22] - 2025-01-16 + +### Security + +- Fix insufficient validation of account URIs ([GHSA-5wxh-3p65-r4g6](https://github.com/mastodon/mastodon/security/advisories/GHSA-5wxh-3p65-r4g6)) + +### Fixed + +- Fix `libyaml` missing from `Dockerfile` build stage (#33591 by @vmstan) +- Fix deletion of unconfirmed users with Webauthn set (#33186 by @ClearlyClaire) + +## [4.1.21] - 2024-12-03 ### Fixed diff --git a/docker-compose.yml b/docker-compose.yml index e426250a23..229b0f0ed9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -56,7 +56,7 @@ services: web: build: . - image: ghcr.io/mastodon/mastodon:v4.1.21 + image: ghcr.io/mastodon/mastodon:v4.1.22 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.1.21 + image: ghcr.io/mastodon/mastodon:v4.1.22 restart: always env_file: .env.production command: node ./streaming @@ -95,7 +95,7 @@ services: sidekiq: build: . - image: ghcr.io/mastodon/mastodon:v4.1.21 + image: ghcr.io/mastodon/mastodon:v4.1.22 restart: always env_file: .env.production command: bundle exec sidekiq diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index 9dd0a53d5e..9853c0e2e7 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -13,7 +13,7 @@ module Mastodon end def patch - 21 + 22 end def flags