mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
removes the documentation group from the Gemfile, thus making RDoc 2.2 required in dev machines
In order to generate the API with that particular version we need to activate the gem in the Rakefile before rake. Therefore the Rakefile does not honor --without for that group now. Installing rdoc is no big deal anyway.
This commit is contained in:
parent
8e56085817
commit
145fbdff67
1 changed files with 1 additions and 4 deletions
5
Gemfile
5
Gemfile
|
@ -5,6 +5,7 @@ gem "rails", :path => File.dirname(__FILE__)
|
||||||
|
|
||||||
gem "rake", ">= 0.8.7"
|
gem "rake", ">= 0.8.7"
|
||||||
gem "mocha", ">= 0.9.8"
|
gem "mocha", ">= 0.9.8"
|
||||||
|
gem "rdoc", "2.2"
|
||||||
|
|
||||||
mri = !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby"
|
mri = !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby"
|
||||||
if mri && RUBY_VERSION < '1.9'
|
if mri && RUBY_VERSION < '1.9'
|
||||||
|
@ -44,10 +45,6 @@ elsif RUBY_ENGINE == "jruby"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
group :documentation do
|
|
||||||
gem 'rdoc', '2.2'
|
|
||||||
end
|
|
||||||
|
|
||||||
if ENV['CI']
|
if ENV['CI']
|
||||||
gem "nokogiri", ">= 1.4.0"
|
gem "nokogiri", ">= 1.4.0"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue