From b29e79f493081925de90f6beb98981ef029c4bdb Mon Sep 17 00:00:00 2001
From: Anna Sidwell <anna@takkaria.org>
Date: Thu, 14 Nov 2019 14:07:17 +0000
Subject: [PATCH] Upgrade us to Ruby 2.6.5 & Jekyll 4

---
 CONTRIBUTING.md   | 6 +++---
 README.md         | 4 ++--
 autonomic.gemspec | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e687b81..b6d3879 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -21,13 +21,13 @@ advised that you use [RVM](https://rvm.io/rvm/install).
 Once you've got that installed and configured, get the latest version of Ruby with:
 
 ```bash
-$ rvm install 2.4.9
+$ rvm install 2.6.5
 ```
 
 Select that version and then create an isolated [gemset](https://rvm.io/gemsets/basics) with:
 
 ```bash
-$ rvm use 2.4.9
+$ rvm use 2.6.5
 $ rvm gemset create autonomic
 $ rvm gemset use autonomic
 ```
@@ -58,7 +58,7 @@ Edit content in the `.md` files under `src` and `src/_posts`.
 When you're hacking later on (or in a new shell), you'll need to run:
 
 ``` bash
-$ rvm use 2.4.8
+$ rvm use 2.6.5
 $ rvm gemset use autonomic
 ```
 
diff --git a/README.md b/README.md
index 7965f7c..18dc787 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 A [Jekyll] based site for the Autonomic Cooperative. The site is based on the [spectral-jekyll-theme] template.
 
-We use [autonomic.zone] for production. We used to use [autonomic-cooperative.gitlab.io] as staging but this isn't really needed anymore.
+master is served up to [autonomic.zone] and [autonomic-cooperative.gitlab.io].
 
 [Jekyll]: https://jekyllrb.com/
 [spectral-jekyll-theme]: https://github.com/andrewbanchich/spectral-jekyll-theme
@@ -13,7 +13,7 @@ We use [autonomic.zone] for production. We used to use [autonomic-cooperative.gi
 
 # Make a change
 
-Work on features in branches. If you commit to master, open a merge request from your branch unless it is a tiny change. Our [deploy] CI stage will push any changes on master branch to [autonomic.zone].
+Work on features in branches. If you commit to master, open a merge request from your branch unless it is a tiny change. Our [pages] CI stage will push any changes on master branch to [autonomic.zone].
 
 [deploy]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/blob/d16aec42bd2ddd7449f55d9f06b03499cc660b22/.gitlab-ci.yml#L17
 
diff --git a/autonomic.gemspec b/autonomic.gemspec
index 2234dc3..d4ebb76 100644
--- a/autonomic.gemspec
+++ b/autonomic.gemspec
@@ -10,6 +10,6 @@ Gem::Specification.new do |spec|
   spec.email       = 'autonomic.posteo.net'
   spec.files       = `git ls-files -z`.split("\x0").select { |f| f.match(%r{^(assets|_layouts|_includes|_sass|LICENSE|README)}i) }
 
-  spec.add_development_dependency "jekyll", ">= 3.3"
+  spec.add_development_dependency "jekyll", ">= 4"
   spec.add_development_dependency "bundler", ">= 1.12"
 end