aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gemfile3
-rw-r--r--Gemfile.lock1
2 files changed, 4 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
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)