about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2022-11-14 20:27:12 +0100
committerGitHub <noreply@github.com>2022-11-14 20:27:12 +0100
commitfb389bd73c8a4bc2924496f6041c8eee27572d21 (patch)
tree915fba2a3eb1c7cc402e78ea0adc2b7b701d7a2b
parent21fd25a269cca742af431f0d13299e139f267346 (diff)
Bump version to 4.0.0 (#20636)
-rw-r--r--CHANGELOG.md6
-rw-r--r--lib/mastodon/version.rb2
2 files changed, 6 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20da71f80..f3d9aa0a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@ Changelog
 
 All notable changes to this project will be documented in this file.
 
-## [Unreleased]
+## [4.0.0] - 2022-11-14
 
 Some of the features in this release have been funded through the [NGI0 Discovery](https://nlnet.nl/discovery) Fund, a fund established by [NLnet](https://nlnet.nl/) with financial support from the European Commission's [Next Generation Internet](https://ngi.eu/) programme, under the aegis of DG Communications Networks, Content and Technology under grant agreement No 825322.
 
@@ -196,6 +196,10 @@ Some of the features in this release have been funded through the [NGI0 Discover
 ### Security
 
 - Fix being able to spoof link verification ([Gargron](https://github.com/mastodon/mastodon/pull/20217))
+- Fix emoji substitution not applying only to text nodes in backend code ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/20641))
+- Fix emoji substitution not applying only to text nodes in web UI ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/20640))
+- Fix rate limiting for paths with formats ([Gargron](https://github.com/mastodon/mastodon/pull/20675))
+- Fix out-of-bound reads in blurhash transcoder ([delroth](https://github.com/mastodon/mastodon/pull/20388))
 
 ## [3.5.3] - 2022-05-26
 ### Added
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index cbf1087dd..3e206e915 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -17,7 +17,7 @@ module Mastodon
     end
 
     def flags
-      'rc4'
+      ''
     end
 
     def suffix