diff options
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | guides/code/getting_started/Gemfile | 6 | ||||
| -rw-r--r-- | guides/code/getting_started/Gemfile.lock | 8 | ||||
| -rw-r--r-- | railties/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 2 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 4 |
6 files changed, 14 insertions, 12 deletions
@@ -18,7 +18,7 @@ gem 'coffee-rails', '~> 4.0.0' gem 'uglifier', '>= 1.3.0', require: false group :doc do - gem 'sdoc' + gem 'sdoc', '~> 0.4.0' gem 'redcarpet', '~> 2.2.2', platforms: :ruby gem 'w3c_validators' gem 'kindlerb' 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) diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 21887c32fe..dc1679c8cb 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,7 @@ +* The `Gemfile` of new applications depends on SDoc ~> 0.4.0. + + *Xavier Noria* + * `test_help.rb` now automatically checks/maintains your test datbase schema. (Use `config.active_record.maintain_test_schema = false` to disable.) diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 4988602aea..1b50569c9e 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -352,7 +352,7 @@ module Rails def sdoc_gemfile_entry comment = 'bundle exec rake doc:rails generates the API under doc/api.' - GemfileEntry.new('sdoc', nil, comment, { group: :doc, require: false }) + GemfileEntry.new('sdoc', '~> 0.4.0', comment, group: :doc) end def coffee_gemfile_entry diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index be109cc598..43900e0fcf 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -390,9 +390,9 @@ class AppGeneratorTest < Rails::Generators::TestCase end end - def test_inclusion_of_lazy_loaded_sdoc + def test_inclusion_of_doc run_generator - assert_file 'Gemfile', /gem 'sdoc', \s+group: :doc, require: false/ + assert_file 'Gemfile', /gem 'sdoc',\s+'~> 0.4.0',\s+group: :doc/ end def test_template_from_dir_pwd |