Merge branch 'next-minor' into develop

2020-06-13 23:29:52 +02:00 · 2020-06-13 23:29:52 +02:00 · e0cf63f1d3
commit e0cf63f1d3
parent 002d427f34 7193099902
3 changed files with 4 additions and 3 deletions
--- a/.ruby-version
+++ b/.ruby-version
@ -1 +1 @@
-2.4
+2.6
--- a/.travis.yml
+++ b/.travis.yml
@ -1,8 +1,8 @@
 language: ruby

 rvm:
-  - 2.4.9
-  - 2.3.8
+  - 2.6.6
+  - 2.5.8

 env:
  - DB=postgresql BUILD_TYPE=cucumber
--- a/Changelog.md
+++ b/Changelog.md
@ -30,6 +30,7 @@ Although the chat was never enabled per default and was marked as experimental,
 # 0.7.14.0

 ## Refactor
+* Update the suggested Ruby version to 2.6. If you run into trouble during the update and you followed our installation guides, run `rvm install 2.6`. [#7929](https://github.com/diaspora/diaspora/pull/7929)

 ## Bug fixes
 * Don't link to deleted users in admin user stats [#8063](https://github.com/diaspora/diaspora/pull/8063)
 @ -1 +1 @@
 .4
 .6