about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-10-12 00:24:09 +0200
committerGitHub <noreply@github.com>2018-10-12 00:24:09 +0200
commitef43f1d2caf874ecc6d82f44e9f2bab5a6e64144 (patch)
tree9bfcf970d6a6159cf2e921ae8cdaa97933467ca4
parent21ad21cb507d7a5f48ef8ee726b2f9308052aa9d (diff)
Bump version to 2.5.2 (#8960)
-rw-r--r--CHANGELOG.md4
-rw-r--r--lib/mastodon/version.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 220cb6591..75a51fc7c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.5.2
+
+- Fix XSS vulnerability (#8959)
+
 ## 2.5.1
 
 - Fix some local images not having their EXIF metadata stripped on upload (#8714)
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index e6d3af35d..a49e7f102 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      1
+      2
     end
 
     def pre