diff options
| author | Akira Matsuda <ronnie@dio.jp> | 2016-12-25 18:25:23 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-25 18:25:23 +0900 |
| commit | e813a9f8605a5cbb34d3ee218f7fed49c98d5378 (patch) | |
| tree | 8740040b9e9da5fcc37b8b6c4ba05e51f74a4abe | |
| parent | f27edc84dfe714869a1702206c5c6e57a0810cfc (diff) | |
| parent | eeb1926158999aca2cf7b57b59157ee9383618f7 (diff) | |
| download | rails-e813a9f8605a5cbb34d3ee218f7fed49c98d5378.tar.gz rails-e813a9f8605a5cbb34d3ee218f7fed49c98d5378.tar.bz2 rails-e813a9f8605a5cbb34d3ee218f7fed49c98d5378.zip | |
Merge pull request #27451 from rails/sdoc-rc1
Bump sdoc to rc1 which includes zzak/sdoc#98
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -41,7 +41,7 @@ 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", "~> 1.2.0" diff --git a/Gemfile.lock b/Gemfile.lock index dc1f57a77d..4100d0e9f4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -280,7 +280,7 @@ GEM rainbow (2.1.0) rake (12.0.0) rb-fsevent (0.9.7) - rdoc (5.0.0.beta2) + rdoc (5.0.0) redcarpet (3.2.3) redis (3.3.1) redis-namespace (1.5.2) @@ -306,8 +306,8 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sdoc (1.0.0.beta2) - rdoc (= 5.0.0.beta2) + sdoc (1.0.0.rc1) + rdoc (= 5.0.0) selenium-webdriver (3.0.1) childprocess (~> 0.5) rubyzip (~> 1.0) @@ -421,7 +421,7 @@ DEPENDENCIES rubocop sass! sass-rails - sdoc (= 1.0.0.beta2) + sdoc (= 1.0.0.rc1) sequel sidekiq sneakers |