Merge branch 'master' into clear_all_environments_log_by_default

1 files changed, 8 insertions, 5 deletions

diff --git a/Gemfile b/Gemfile
index 53044252a0..e1e892c7f3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,22 +29,25 @@ gem "bcrypt", "~> 3.1.11", require: false
 # sprockets.
 gem "uglifier", ">= 1.3.0", require: false
 
-# Track stable branch of sass because it doesn't have circular require warnings.
-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"
+
+gem "rubocop", require: false
+
 group :doc do
-  gem "sdoc", "1.0.0.beta2"
+  gem "sdoc", "1.0.0.rc1"
   gem "redcarpet", "~> 3.2.3", platforms: :ruby
   gem "w3c_validators"
-  gem "kindlerb", "0.1.1"
+  gem "kindlerb", "~> 1.2.0"
 end
 
 # Active Support.
 gem "dalli", ">= 2.2.1"
 gem "listen", ">= 3.0.5", "< 3.2", require: false
+gem "libxml-ruby", platforms: :ruby
 
 # Active Job.
 group :job do