From 7193099902486429b4fcbbb567bbca2f3cbef6d4 Mon Sep 17 00:00:00 2001
From: flaburgan <flaburgan@geexxx.fr>
Date: Sat, 13 Jun 2020 21:36:44 +0200
Subject: [PATCH] Bump ruby version to 2.6, drop support of 2.3

closes #7929
---
 .ruby-version | 2 +-
 .travis.yml   | 4 ++--
 Changelog.md  | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index 6b4950e3d..5154b3f68 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.4
+2.6
diff --git a/.travis.yml b/.travis.yml
index 135c5b9bd..f3b0fd484 100644
--- 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
diff --git a/Changelog.md b/Changelog.md
index 4e39c99c0..08ebdaacb 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,7 @@
 # 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)