summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-02-02 11:49:22 +0100
committerClaire <claire.github-309c@sitedethib.com>2022-02-02 23:48:38 +0100
commitbb7b2868a0d52a5e656c46642f1563c0b952f6f7 (patch)
tree1bde0664c2d435f7c7dd27d19ae61201ea4b6674
parenta06dda41d04b073a9cc41930a9c80bd91c2111e5 (diff)
Bump version to 3.4.6
-rw-r--r--CHANGELOG.md12
-rw-r--r--chart/values.yaml2
-rw-r--r--docker-compose.yml6
-rw-r--r--lib/mastodon/version.rb2
4 files changed, 17 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9deff5a0d1f..c2eff7fa314 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,18 @@ Changelog
All notable changes to this project will be documented in this file.
+## [3.4.6] - 2022-02-03
+### Fixed
+- Fix `mastodon:webpush:generate_vapid_key` task requiring a functional environment ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17338))
+- Fix spurious errors when receiving an Add activity for a private post ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17425))
+
+### Security
+- Fix error-prone SQL queries ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/15828))
+- Fix not compacting incoming signed JSON-LD activities ([puckipedia](https://github.com/mastodon/mastodon/pull/17426), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/17428)) (CVE-2022-24307)
+- Fix insufficient sanitization of report comments ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17430))
+- Fix stop condition of a Common Table Expression ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17427))
+- Disable legacy XSS filtering ([Wonderfall](https://github.com/mastodon/mastodon/pull/17289))
+
## [3.4.5] - 2022-01-31
### Added
- Add more advanced migration tests ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/17393))
diff --git a/chart/values.yaml b/chart/values.yaml
index a638f4a7d66..d3036bb4a20 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -8,7 +8,7 @@ image:
# built from the most recent commit
#
# tag: latest
- tag: v3.3.0
+ tag: v3.4.6
# use `Always` when using `latest` tag
pullPolicy: IfNotPresent
diff --git a/docker-compose.yml b/docker-compose.yml
index 288a4fdf697..97b6f16552e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -43,7 +43,7 @@ services:
web:
build: .
- image: tootsuite/mastodon:v3.4.5
+ image: tootsuite/mastodon:v3.4.6
restart: always
env_file: .env.production
command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"
@@ -63,7 +63,7 @@ services:
streaming:
build: .
- image: tootsuite/mastodon:v3.4.5
+ image: tootsuite/mastodon:v3.4.6
restart: always
env_file: .env.production
command: node ./streaming
@@ -80,7 +80,7 @@ services:
sidekiq:
build: .
- image: tootsuite/mastodon:v3.4.5
+ image: tootsuite/mastodon:v3.4.6
restart: always
env_file: .env.production
command: bundle exec sidekiq
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 1ba45aeca33..d71b5b4ac19 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
end
def patch
- 5
+ 6
end
def flags