diff options
author | Xavier Noria <fxn@hashref.com> | 2013-03-30 00:05:30 +0100 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2013-03-30 00:10:52 +0100 |
commit | 2595611dc38d5d51df45325d818074d1da23c96f (patch) | |
tree | ba44b9bddd055f4a473367d14941c19712796ab5 | |
parent | 84c0ac3b56e1e3d8dd6401e5cf49a4019acc1b32 (diff) | |
download | rails-2595611dc38d5d51df45325d818074d1da23c96f.tar.gz rails-2595611dc38d5d51df45325d818074d1da23c96f.tar.bz2 rails-2595611dc38d5d51df45325d818074d1da23c96f.zip |
rdoc is no longer a gem dependency, sdoc becomes a runtime dependency
-rw-r--r-- | guides/code/getting_started/Gemfile | 5 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/Gemfile | 5 | ||||
-rw-r--r-- | railties/railties.gemspec | 1 |
3 files changed, 10 insertions, 1 deletions
diff --git a/guides/code/getting_started/Gemfile b/guides/code/getting_started/Gemfile index f5b7b11d3a..5b574cfc1d 100644 --- a/guides/code/getting_started/Gemfile +++ b/guides/code/getting_started/Gemfile @@ -21,6 +21,11 @@ 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' +end + # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 1.2' diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index f6bd107eba..b3883a94fc 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile @@ -9,6 +9,11 @@ source 'https://rubygems.org' <%= assets_gemfile_entry %> <%= javascript_gemfile_entry -%> +group :doc do + # bundle exec rake doc:rails generates the API under doc/api. + gem 'sdoc' +end + # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 1.0.1' diff --git a/railties/railties.gemspec b/railties/railties.gemspec index a55bf012da..5b0ed90cda 100644 --- a/railties/railties.gemspec +++ b/railties/railties.gemspec @@ -28,5 +28,4 @@ Gem::Specification.new do |s| s.add_dependency 'rake', '>= 0.8.7' s.add_dependency 'thor', '>= 0.17.0', '< 2.0' - s.add_dependency 'rdoc', '~> 3.4' end |