summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2024-02-15 12:01:32 +0100
committerClaire <claire.github-309c@sitedethib.com>2024-02-16 11:57:29 +0100
commite5726d211fd3dc1d640f202e808e25891d765586 (patch)
treeb1cad510d145a18f4020f478ee6c1ba6f344937f
parentc78c003272b6ce3276a86b5da511ff99fd5436b7 (diff)
Bump version to v4.0.15v4.0.15stable-4.0
-rw-r--r--CHANGELOG.md10
-rw-r--r--docker-compose.yml6
-rw-r--r--lib/mastodon/version.rb2
3 files changed, 14 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 244be4416dd..b3cad7a90eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,16 @@ All notable changes to this project will be documented in this file.
**The 4.0.x branch has reached its end of life and will not receive any further update.**
This means that no security fix will be made available for this branch after this date, and you will need to update to a more recent version (such as the 4.2.x branch) to receive security fixes.
+## [4.0.15] - 2024-02-16
+
+### Fixed
+
+- Fix OmniAuth tests and edge cases in error handling ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/29201), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/29207))
+
+### Security
+
+- Fix insufficient checking of remote posts ([GHSA-jhrq-qvrm-qr36](https://github.com/mastodon/mastodon/security/advisories/GHSA-jhrq-qvrm-qr36))
+
## [4.0.14] - 2024-02-14
### Security
diff --git a/docker-compose.yml b/docker-compose.yml
index a5ca81daf7a..34ff2f5e91f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -56,7 +56,7 @@ services:
web:
build: .
- image: ghcr.io/mastodon/mastodon:v4.0.14
+ image: ghcr.io/mastodon/mastodon:v4.0.15
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.0.14
+ image: ghcr.io/mastodon/mastodon:v4.0.15
restart: always
env_file: .env.production
command: node ./streaming
@@ -95,7 +95,7 @@ services:
sidekiq:
build: .
- image: ghcr.io/mastodon/mastodon:v4.0.14
+ image: ghcr.io/mastodon/mastodon:v4.0.15
restart: always
env_file: .env.production
command: bundle exec sidekiq
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index bae4429d3db..66f0e30cd3e 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
end
def patch
- 14
+ 15
end
def flags