diff --git a/Gemfile b/Gemfile index a4b56aaa7d..53044252a0 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", "1.0.0.beta1" + gem "sdoc", "1.0.0.beta2" gem "redcarpet", "~> 3.2.3", platforms: :ruby gem "w3c_validators" gem "kindlerb", "0.1.1" diff --git a/Gemfile.lock b/Gemfile.lock index 4f4401ca85..d4059c607d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -210,7 +210,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (1.8.3) + json (2.0.2) kindlerb (0.1.1) mustache nokogiri @@ -276,8 +276,7 @@ GEM loofah (~> 2.0) rake (11.3.0) rb-fsevent (0.9.7) - rdoc (4.2.2) - json (~> 1.4) + rdoc (5.0.0.beta2) redcarpet (3.2.3) redis (3.3.1) redis-namespace (1.5.2) @@ -296,8 +295,8 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sdoc (1.0.0.beta1) - rdoc (~> 4.0) + sdoc (1.0.0.beta2) + rdoc (= 5.0.0.beta2) selenium-webdriver (2.53.4) childprocess (~> 0.5) rubyzip (~> 1.0) @@ -407,7 +406,7 @@ DEPENDENCIES resque-scheduler sass! sass-rails - sdoc (= 1.0.0.beta1) + sdoc (= 1.0.0.beta2) sequel sidekiq sneakers