summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-11-14 22:24:12 +0100
committerClaire <claire.github-309c@sitedethib.com>2022-11-14 22:24:12 +0100
commit4a5f458ea0f348eab838365d4f526210dc5d57d4 (patch)
tree4e72b4277f1cdee314fe88af1eda4f040afc4fe7
parenta9be15e3cd345684ae88dbaf2a21c5a2f3bf13aa (diff)
Bump version to 3.4.10v3.4.10
-rw-r--r--CHANGELOG.md5
-rw-r--r--chart/values.yaml2
-rw-r--r--docker-compose.yml6
-rw-r--r--lib/mastodon/version.rb2
4 files changed, 10 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7c1664b1ab..17876b9dddf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,11 @@ Changelog
All notable changes to this project will be documented in this file.
+## [3.4.10] - 2022-11-14
+## Fixed
+
+- Fix nodes order being sometimes mangled when rewriting emoji ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/20677))
+
## [3.4.9] - 2022-11-14
### Security
diff --git a/chart/values.yaml b/chart/values.yaml
index 40ba5a4e359..040dd7fd9a3 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -8,7 +8,7 @@ image:
# built from the most recent commit
#
# tag: latest
- tag: v3.4.9
+ tag: v3.4.10
# use `Always` when using `latest` tag
pullPolicy: IfNotPresent
diff --git a/docker-compose.yml b/docker-compose.yml
index ed1014fbaa6..713b4b0510a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -43,7 +43,7 @@ services:
web:
build: .
- image: tootsuite/mastodon:v3.4.9
+ image: tootsuite/mastodon:v3.4.10
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.9
+ image: tootsuite/mastodon:v3.4.10
restart: always
env_file: .env.production
command: node ./streaming
@@ -80,7 +80,7 @@ services:
sidekiq:
build: .
- image: tootsuite/mastodon:v3.4.9
+ image: tootsuite/mastodon:v3.4.10
restart: always
env_file: .env.production
command: bundle exec sidekiq
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 573373d27fa..df4d2c26484 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
end
def patch
- 9
+ 10
end
def flags