From 8f1847df31f5195abb427854fa1e2bf1e8ba23a0 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 15 Sep 2026 14:10:38 +0200
Subject: [PATCH] Bump version to v4.6.8

---
 CHANGELOG.md                | 16 +++++++++++++++-
 config/initializers/vips.rb |  1 -
 docker-compose.yml          |  6 +++---
 lib/mastodon/version.rb     |  2 +-
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ea2ea3a79..f2b8385d55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,23 @@
 
 All notable changes to this project will be documented in this file.
 
+## [4.6.8] - 2026-09-15
+
+### Security
+
+- Temporarily disable HEIF support
+
+### Fixes
+
+- Fix relative privacy policy links in subscription emails (#40486 by @crafkaz)
+- Fix canonical email blocks interfering with freezing or approving users (#40463 by @ClearlyClaire)
+- Fix 500 error when submitting a status twice (#40439 by @ClearlyClaire)
+- Fix account deletion not deleting generated annual reports (#40394 by @ClearlyClaire)
+- Fix notifications not being cleaned up when notification requests are deleted in bulk (#40393 by @ClearlyClaire)
+
 ## [4.6.7] - 2026-09-01
 
-## Security
+### Security
 
 - Update dependencies
 - Fix password authentication bypass in 2FA auth for LDAP/PAM/SSO accounts ([GHSA-vx32-x96w-qq65](https://github.com/mastodon/mastodon/security/advisories/GHSA-vx32-x96w-qq65))
diff --git a/config/initializers/vips.rb b/config/initializers/vips.rb
index cd8d2410b9..4d68e9023a 100644
--- a/config/initializers/vips.rb
+++ b/config/initializers/vips.rb
@@ -17,7 +17,6 @@ Vips.block('VipsForeign', true)
   VipsForeignLoadJpeg
   VipsForeignLoadPng
   VipsForeignLoadWebp
-  VipsForeignLoadHeif
   VipsForeignSavePng
   VipsForeignSaveSpng
   VipsForeignSaveJpeg
diff --git a/docker-compose.yml b/docker-compose.yml
index 99cea33641..d746e1b2b1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -60,7 +60,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.6.7
+    image: ghcr.io/mastodon/mastodon:v4.6.8
     restart: always
     env_file: .env.production
     command: bundle exec puma -C config/puma.rb
@@ -84,7 +84,7 @@ services:
     # build:
     #   dockerfile: ./streaming/Dockerfile
     #   context: .
-    image: ghcr.io/mastodon/mastodon-streaming:v4.6.7
+    image: ghcr.io/mastodon/mastodon-streaming:v4.6.8
     restart: always
     env_file: .env.production
     command: node ./streaming/index.js
@@ -103,7 +103,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.6.7
+    image: ghcr.io/mastodon/mastodon:v4.6.8
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 157441748e..c5b32ca19f 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      7
+      8
     end
 
     def default_prerelease