summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2023-10-09 14:03:10 +0200
committerClaire <claire.github-309c@sitedethib.com>2023-10-10 13:50:10 +0200
commitdb59d8486bd12f7d32dd9785cbf2daf9115d0e16 (patch)
treea85e89c14e270d5522e156281c8a487ef41da025
parent7fb3ee0bc67cd7078fa7558483121dbe08202d8a (diff)
Bump version to v3.5.15v3.5.15
-rw-r--r--CHANGELOG.md16
-rw-r--r--docker-compose.yml6
-rw-r--r--lib/mastodon/version.rb2
3 files changed, 19 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb0d7a244a9..9e17ea8d613 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,21 @@ All notable changes to this project will be documented in this file.
## End of life notice
**The 3.5.x branch will not receive any update after 2023-12-31.**
-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.1.x branch) to receive security fixes.
+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.
+
+## [3.5.15] - 2023-10-10
+
+### Changed
+
+- Change user archive export allowed period from 7 days to 6 days ([suddjian](https://github.com/mastodon/mastodon/pull/27200))
+
+### Fixed
+
+- Fix mentions being matched in some URL query strings ([mjankowski](https://github.com/mastodon/mastodon/pull/25656))
+- Fix importer returning negative row estimates ([jgillich](https://github.com/mastodon/mastodon/pull/27258))
+- Fix filtering audit log for entries about disabling 2FA ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27186))
+- Fix tIME chunk not being properly removed from PNG uploads ([TheEssem](https://github.com/mastodon/mastodon/pull/27111))
+- Fix inefficient queries in “Follows and followers” as well as several admin pages ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/27116), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/27306))
## [3.5.14] - 2023-09-19
diff --git a/docker-compose.yml b/docker-compose.yml
index 4001b1e7fcd..a6840f40da3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -44,7 +44,7 @@ services:
web:
build: .
- image: ghcr.io/mastodon/mastodon:v3.5.14
+ image: ghcr.io/mastodon/mastodon:v3.5.15
restart: always
env_file: .env.production
command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"
@@ -65,7 +65,7 @@ services:
streaming:
build: .
- image: ghcr.io/mastodon/mastodon:v3.5.14
+ image: ghcr.io/mastodon/mastodon:v3.5.15
restart: always
env_file: .env.production
command: node ./streaming
@@ -83,7 +83,7 @@ services:
sidekiq:
build: .
- image: ghcr.io/mastodon/mastodon:v3.5.14
+ image: ghcr.io/mastodon/mastodon:v3.5.15
restart: always
env_file: .env.production
command: bundle exec sidekiq
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 0dcef7f6b3a..30e7cac69af 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