From 3a558aa2bc8ce3834ee79ff3346bcf5d7debbbd0 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Tue, 15 Nov 2016 09:26:03 +0900
Subject: Make sure to bundle json 2.x on CI

Without this, bundler tries to bundle json 1.8 on Ruby 2.4 in some cases
https://travis-ci.org/rails/rails/jobs/175874852
---
 Gemfile | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'Gemfile')

diff --git a/Gemfile b/Gemfile
index 97a19188bc..10e146d887 100644
--- a/Gemfile
+++ b/Gemfile
@@ -35,6 +35,9 @@ gem "sass", github: "sass/sass", branch: "stable", require: false
 # FIXME: Remove this fork after https://github.com/nex3/rb-inotify/pull/49 is fixed.
 gem "rb-inotify", github: "matthewd/rb-inotify", branch: "close-handling", require: false
 
+# Explicitly avoid 1.x that doesn't support Ruby 2.4+
+gem "json", ">= 2.0.0"
+
 group :doc do
   gem "sdoc", "1.0.0.beta2"
   gem "redcarpet", "~> 3.2.3", platforms: :ruby
-- 
cgit v1.2.3