From 6049249c6c5c2a3078bb0f146168e8f9c0d99bc7 Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Sun, 12 Jan 2014 01:12:12 +0100 Subject: upgrade SDoc Kudos to @zzak for taking over SDoc and make it work with RDoc 4. --- guides/code/getting_started/Gemfile | 6 ++---- guides/code/getting_started/Gemfile.lock | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'guides/code') diff --git a/guides/code/getting_started/Gemfile b/guides/code/getting_started/Gemfile index d573488bdb..0e3dac48e2 100644 --- a/guides/code/getting_started/Gemfile +++ b/guides/code/getting_started/Gemfile @@ -22,10 +22,8 @@ gem 'jquery-rails' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks gem 'turbolinks' -group :doc do - # bundle exec rake doc:rails generates the API under doc/api. - gem 'sdoc', require: false -end +# bundle exec rake doc:rails generates the API under doc/api. +gem 'sdoc', '~> 0.4.0', group: :doc # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 2.0' diff --git a/guides/code/getting_started/Gemfile.lock b/guides/code/getting_started/Gemfile.lock index 1c30ac5d75..112a50d7e9 100644 --- a/guides/code/getting_started/Gemfile.lock +++ b/guides/code/getting_started/Gemfile.lock @@ -71,16 +71,16 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.1.0) - rdoc (3.12.2) + rdoc (0.4.0) json (~> 1.4) sass (3.2.9) sass-rails (4.0.0) railties (>= 4.0.0.beta, < 5.0) sass (>= 3.1.10) sprockets-rails (~> 2.0.0) - sdoc (0.3.20) - json (>= 1.1.3) - rdoc (~> 3.10) + sdoc (0.4.0) + json (~> 1.8) + rdoc (~> 4.0, < 5.0) sprockets (2.10.0) hike (~> 1.2) multi_json (~> 1.0) -- cgit v1.2.3