summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2024-01-29 17:13:46 +0100
committerClaire <claire.github-309c@sitedethib.com>2024-01-29 17:13:46 +0100
commitbd2a91d110d33d7d872dae8a42be7b1cd8399b0b (patch)
tree69fdf67c6b7ddb836f1aaf4888b749b9022c0f21
parent4633bb8ce09f216170c3f8370a8e48f3a41872cb (diff)
Bump version to v4.2.5releases/v4.2.5
-rw-r--r--CHANGELOG.md6
-rw-r--r--docker-compose.yml6
-rw-r--r--lib/mastodon/version.rb2
3 files changed, 10 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c733f9a96c..98745de4aaf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
All notable changes to this project will be documented in this file.
+## [4.2.5] - 2024-02-01
+
+### Security
+
+- Fix TODO
+
## [4.2.4] - 2024-01-24
### Fixed
diff --git a/docker-compose.yml b/docker-compose.yml
index b096012de17..8aa93b1c08e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -56,7 +56,7 @@ services:
web:
build: .
- image: ghcr.io/mastodon/mastodon:v4.2.4
+ image: ghcr.io/mastodon/mastodon:v4.2.5
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.2.4
+ image: ghcr.io/mastodon/mastodon:v4.2.5
restart: always
env_file: .env.production
command: node ./streaming
@@ -95,7 +95,7 @@ services:
sidekiq:
build: .
- image: ghcr.io/mastodon/mastodon:v4.2.4
+ image: ghcr.io/mastodon/mastodon:v4.2.5
restart: always
env_file: .env.production
command: bundle exec sidekiq
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 6382712cd73..f9f801c7719 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
end
def patch
- 4
+ 5
end
def default_prerelease