diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-08-17 13:19:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-17 13:19:53 -0400 |
| commit | 25ccf03af248a402a668295ebd2dcadd656c0f1d (patch) | |
| tree | 3b7ae6d0984d6afc7c38b130c4082f7b942f3d89 | |
| parent | 677ba214377d179a15a904c99b9357295c887d1c (diff) | |
| parent | 6db4cf9beb3576922cb330392c68fc1bb6a8f0d5 (diff) | |
| download | rails-25ccf03af248a402a668295ebd2dcadd656c0f1d.tar.gz rails-25ccf03af248a402a668295ebd2dcadd656c0f1d.tar.bz2 rails-25ccf03af248a402a668295ebd2dcadd656c0f1d.zip | |
Merge pull request #30199 from robin850/upgrade-sdoc
Temporarily point to a fork of SDoc
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 12 |
2 files changed, 10 insertions, 4 deletions
@@ -40,7 +40,7 @@ gem "rubocop", ">= 0.47", require: false gem "rb-inotify", github: "matthewd/rb-inotify", branch: "close-handling", require: false group :doc do - gem "sdoc", "> 1.0.0.rc1", "< 2.0" + gem "sdoc", github: "robin850/sdoc", branch: "upgrade" gem "redcarpet", "~> 3.2.3", platforms: :ruby gem "w3c_validators" gem "kindlerb", "~> 1.2.0" diff --git a/Gemfile.lock b/Gemfile.lock index 1fcc802b5b..516b4155c1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -41,6 +41,14 @@ GIT sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) +GIT + remote: https://github.com/robin850/sdoc.git + revision: 0e340352f3ab2f196c8a8743f83c2ee286e4f71c + branch: upgrade + specs: + sdoc (1.0.0.rc2) + rdoc (~> 5.0) + PATH remote: . specs: @@ -389,8 +397,6 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sdoc (1.0.0.rc2) - rdoc (~> 5.0) selenium-webdriver (3.5.1) childprocess (~> 0.5) rubyzip (~> 1.0) @@ -521,7 +527,7 @@ DEPENDENCIES resque-scheduler rubocop (>= 0.47) sass-rails! - sdoc (> 1.0.0.rc1, < 2.0) + sdoc! sequel sidekiq sneakers |