diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d27b2b75f2..a7b706b534c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file. -## [4.7.0] - UNRELEASED +## [4.7.0] - 2026-08-20 ### Added diff --git a/SECURITY.md b/SECURITY.md index 8e359433074..27b831632f3 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -15,7 +15,8 @@ A "vulnerability in Mastodon" is a vulnerability in the code distributed through | Version | Supported | | ------- | ---------------- | +| 4.7.0 | Yes | | 4.6.0 | Yes | -| 4.5.x | Yes | +| 4.5.x | Until 2027-02-20 | | 4.4.x | Until 2026-12-17 | | < 4.4 | No | diff --git a/docker-compose.yml b/docker-compose.yml index 6e9ef857f4f..77e166f6292 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.7.0-rc.1 + image: ghcr.io/mastodon/mastodon:v4.7.0 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.7.0-rc.1 + image: ghcr.io/mastodon/mastodon-streaming:v4.7.0 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.7.0-rc.1 + image: ghcr.io/mastodon/mastodon:v4.7.0 restart: always env_file: .env.production command: bundle exec sidekiq diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index a4963020ec6..e7336499a06 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -17,7 +17,7 @@ module Mastodon end def default_prerelease - 'rc.1' + '' end def prerelease