aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock5
2 files changed, 3 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 6df626828c..a4b56aaa7d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,7 +36,7 @@ gem "sass", github: "sass/sass", branch: "stable", require: false
gem "rb-inotify", github: "matthewd/rb-inotify", branch: "close-handling", require: false
group :doc do
- gem "sdoc", "~> 0.4.0"
+ gem "sdoc", "1.0.0.beta1"
gem "redcarpet", "~> 3.2.3", platforms: :ruby
gem "w3c_validators"
gem "kindlerb", "0.1.1"
diff --git a/Gemfile.lock b/Gemfile.lock
index 0d70b24b5c..4f4401ca85 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -296,8 +296,7 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
- sdoc (0.4.1)
- json (~> 1.7, >= 1.7.7)
+ sdoc (1.0.0.beta1)
rdoc (~> 4.0)
selenium-webdriver (2.53.4)
childprocess (~> 0.5)
@@ -408,7 +407,7 @@ DEPENDENCIES
resque-scheduler
sass!
sass-rails
- sdoc (~> 0.4.0)
+ sdoc (= 1.0.0.beta1)
sequel
sidekiq
sneakers