From 33fa2e8a9eb7ea97b5eb70fc7c062467f59d4f9c Mon Sep 17 00:00:00 2001
From: flaburgan <flaburgan@geexxx.fr>
Date: Thu, 29 Dec 2016 19:11:28 +0100
Subject: [PATCH 1/2] Bump ruby to 2.4

---
 .ruby-version | 2 +-
 .travis.yml   | 2 +-
 Changelog.md  | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index bb576dbde..6b4950e3d 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.3
+2.4
diff --git a/.travis.yml b/.travis.yml
index db4fad306..7bc30dfe0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
 language: ruby
 
 rvm:
+  - 2.4.1
   - 2.3.4
-  - 2.1.10
 
 env:
   - DB=postgresql BUILD_TYPE=cucumber
diff --git a/Changelog.md b/Changelog.md
index c67932a00..d40a5e03a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,10 @@
 # 0.7.0.0
 
+## Supported Ruby versions
+
+This release recommends using Ruby 2.4, while retaining Ruby 2.3 as an officially supported version.
+Ruby 2.1 is no longer officially supported.
+
 ## Refactor
 
 * Make the mention syntax more flexible [#7305](https://github.com/diaspora/diaspora/pull/7305)

From 726e56ffb231d28c7d7d1f735707e959ba2b4c5b Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sun, 23 Jul 2017 02:42:01 +0200
Subject: [PATCH 2/2] Install gems for production, to see when compatibility
 breaks

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7bc30dfe0..bbc17822c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ before_install:
   - tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs
   - export PATH=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
 
-bundler_args: "--deployment --without development production --with mysql postgresql --jobs 3 --retry 3"
+bundler_args: "--deployment --without development --with mysql postgresql --jobs 3 --retry 3"
 
 script: "./script/ci/build.sh"