From 65662b384742ba733dd590fd7eccb5abf8c6d0c8 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 7 Oct 2018 20:13:54 +0200
Subject: [PATCH] Bump version to 2.5.1

---
 CHANGELOG.md            | 10 ++++++++++
 lib/mastodon/version.rb |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000000..220cb65915
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,10 @@
+## 2.5.1
+
+- Fix some local images not having their EXIF metadata stripped on upload (#8714)
+- Fix class autoloading issue in ActivityPub Create handler (#8820)
+- Fix cache statistics not being sent via statsd when statsd enabled (#8831)
+- Fix being able to enable a disabled relay via ActivityPub Accept handler (#8864)
+- Bump nokogiri from 1.8.4 to 1.8.5 (#8881)
+- Bump puma from 3.11.4 to 3.12.0 (#8883)
+- Fix database migrations for PostgreSQL below 9.5 (#8903)
+- Fix being able to report statuses not belonging to the reported account (#8916)
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 0e41a9a6d9..e6d3af35db 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      0
+      1
     end
 
     def pre
-- 
GitLab