aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorAkira Matsuda <ronnie@dio.jp>2016-11-15 09:26:03 +0900
committerAkira Matsuda <ronnie@dio.jp>2016-11-15 09:26:03 +0900
commit3a558aa2bc8ce3834ee79ff3346bcf5d7debbbd0 (patch)
treeef5a8fb754df31bd9dca5d2c62370ed95018ab40 /Gemfile
parenta4208bb974ff7970e2dda91868b4846e5d5292fa (diff)
downloadrails-3a558aa2bc8ce3834ee79ff3346bcf5d7debbbd0.tar.gz
rails-3a558aa2bc8ce3834ee79ff3346bcf5d7debbbd0.tar.bz2
rails-3a558aa2bc8ce3834ee79ff3346bcf5d7debbbd0.zip
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
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile3
1 files changed, 3 insertions, 0 deletions
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