From d00b4bd6a4d13d42d2ac360bebfb23007267b15d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?KMY=EF=BC=88=E9=9B=AA=E3=81=82=E3=81=99=E3=81=8B=EF=BC=89?=
 <tt@kmycode.net>
Date: Thu, 5 Dec 2024 10:13:48 +0900
Subject: [PATCH] Release: 15.7-lts (#938)

* Fix bundle install

* Bump version to 15.7-lts
---
 .bundler-audit.yml      |  6 ++++++
 Gemfile.lock            | 14 +++++++-------
 docker-compose.yml      |  6 +++---
 lib/mastodon/version.rb |  2 +-
 4 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644 .bundler-audit.yml

diff --git a/.bundler-audit.yml b/.bundler-audit.yml
new file mode 100644
index 00000000000000..3d2216569032f2
--- /dev/null
+++ b/.bundler-audit.yml
@@ -0,0 +1,6 @@
+ignore:
+  - CVE-2024-53985
+  - CVE-2024-53986
+  - CVE-2024-53987
+  - CVE-2024-53988
+  - CVE-2024-53989
diff --git a/Gemfile.lock b/Gemfile.lock
index d211c6cc716595..0236bf37703fbe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -45,7 +45,7 @@ GEM
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6.1)
+      rails-html-sanitizer (~> 1.6)
     actiontext (7.1.4.1)
       actionpack (= 7.1.4.1)
       activerecord (= 7.1.4.1)
@@ -58,7 +58,7 @@ GEM
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6.1)
+      rails-html-sanitizer (~> 1.6)
     active_model_serializers (0.10.14)
       actionpack (>= 4.1)
       activemodel (>= 4.1)
@@ -412,7 +412,7 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.23.1)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -433,7 +433,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2024.0820)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.8)
+    mini_portile2 (2.8.7)
     minitest (5.25.1)
     msgpack (1.7.2)
     multi_json (1.15.0)
@@ -454,7 +454,7 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
-    nokogiri (1.16.8)
+    nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oj (3.16.6)
@@ -660,9 +660,9 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.1)
+    rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
-      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+      nokogiri (~> 1.14)
     rails-i18n (7.0.9)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
diff --git a/docker-compose.yml b/docker-compose.yml
index cfb63d6136dc5a..5f2343cfbc02f1 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: kmyblue:15.6-lts
+    image: kmyblue:15.7-lts
     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: kmyblue-streaming:15.6-lts
+    image: kmyblue-streaming:15.7-lts
     restart: always
     env_file: .env.production
     command: node ./streaming/index.js
@@ -101,7 +101,7 @@ services:
 
   sidekiq:
     build: .
-    image: kmyblue:15.6-lts
+    image: kmyblue:15.7-lts
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 41e9254cc35017..dedfcbb3573195 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ def kmyblue_major
     end
 
     def kmyblue_minor
-      6
+      7
     end
 
     def kmyblue_flag