diff options
| author | Akira Matsuda <ronnie@dio.jp> | 2016-11-15 09:26:03 +0900 |
|---|---|---|
| committer | Akira Matsuda <ronnie@dio.jp> | 2016-11-15 09:26:03 +0900 |
| commit | 3a558aa2bc8ce3834ee79ff3346bcf5d7debbbd0 (patch) | |
| tree | ef5a8fb754df31bd9dca5d2c62370ed95018ab40 | |
| parent | a4208bb974ff7970e2dda91868b4846e5d5292fa (diff) | |
| download | rails-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
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 1 |
2 files changed, 4 insertions, 0 deletions
@@ -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 diff --git a/Gemfile.lock b/Gemfile.lock index 1a39484c2b..06e822964b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -379,6 +379,7 @@ DEPENDENCIES em-hiredis hiredis jquery-rails + json (>= 2.0.0) kindlerb (>= 1.0.1) listen (>= 3.0.5, < 3.2) minitest (< 5.3.4) |