diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-04-25 15:24:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-25 15:24:37 -0400 |
| commit | 013c7d561fa6fe40afbba56d60632b5de0f38fa7 (patch) | |
| tree | 484271f1923022b3f8b95d4bb9dc2cdfd98887bb | |
| parent | 28bdb2ad1a0d2fd0810a491e9209cf2fbc5b0090 (diff) | |
| parent | 8e98cdfe633a7fc36437bfc10ae1ae656c779a7d (diff) | |
| download | rails-013c7d561fa6fe40afbba56d60632b5de0f38fa7.tar.gz rails-013c7d561fa6fe40afbba56d60632b5de0f38fa7.tar.bz2 rails-013c7d561fa6fe40afbba56d60632b5de0f38fa7.zip | |
Merge pull request #28840 from rails/sane-sdoc
Ask for a sane version of SDoc
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -42,7 +42,7 @@ gem "json", ">= 2.0.0" gem "rubocop", ">= 0.47", require: false group :doc do - gem "sdoc", "1.0.0.rc1" + gem "sdoc", "> 1.0.0.rc1", "< 2.0" gem "redcarpet", "~> 3.2.3", platforms: :ruby gem "w3c_validators" gem "kindlerb", "~> 1.2.0" diff --git a/Gemfile.lock b/Gemfile.lock index da7e5a8cab..445bab1ca3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -264,7 +264,7 @@ GEM rainbow (2.2.1) rake (12.0.0) rb-fsevent (0.9.8) - rdoc (5.0.0) + rdoc (5.1.0) redcarpet (3.2.3) redis (3.3.2) redis-namespace (1.5.2) @@ -298,8 +298,8 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sdoc (1.0.0.rc1) - rdoc (= 5.0.0) + sdoc (1.0.0.rc2) + rdoc (~> 5.0) selenium-webdriver (3.0.5) childprocess (~> 0.5) rubyzip (~> 1.0) @@ -417,7 +417,7 @@ DEPENDENCIES resque-scheduler rubocop (>= 0.47) sass-rails - sdoc (= 1.0.0.rc1) + sdoc (> 1.0.0.rc1, < 2.0) sequel sidekiq sneakers |