Bump version to 2.6.0rc2 (#9087)

* Bump version to 2.6.0rc2

* Update CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 666ccd14b2241833704b693f8e58e29738a656f8..f989f111e43bdae60b356d08f7da76f0eefc10b2 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,8 @@ All notable changes to this project will be documented in this file.
 - Add `description` meta tag (#8941)
 - Add `Content-Security-Policy` header (#8957)
 - Add cache for the instance info API (#8765)
+- Add suggested follows to search screen in mobile layout (#9010)
+- Add CORS header to `/.well-known/*` routes (#9083)
 
 ### Changed
 
@@ -57,6 +59,7 @@ All notable changes to this project will be documented in this file.
 - Change style of success and failure messages (#8973)
 - Change DM filtering to always allow DMs from staff (#8993)
 - Change recommended Ruby version to 2.5.3 (#9003)
+- Change docker-compose default to persist volumes in current directory (#9055)
 
 ### Deprecated
 
@@ -85,6 +88,8 @@ All notable changes to this project will be documented in this file.
 - Fix crash in streaming API when tag param missing (#8955)
 - Fix hotkeys not working when no element is focused (#8998)
 - Fix some hotkeys not working on detailed status view (#9006)
+- Fix og:url on status pages (#9047)
+- Fix upload option buttons only being visible on hover (#9074)
 
 ## [2.5.2] - 2018-10-12
 ### Security

diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index d0a1542ddda291ccc816fc4333427fd15c563af4..8b26f4ce6587e3613f823448073e7b56fd5ceb29 100644 (file)
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -21,7 +21,7 @@ module Mastodon
     end
 
     def flags
-      'rc1'
+      'rc2'
     end
 
     def to_a