From 07c6b7a6ad70fd021516d413caa5c3ac914933ac Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Wed, 16 Jun 2010 03:45:18 +0200 Subject: migrates the Jamis template to RDoc 2.x, the root Rakefile requires RDoc 2.2 To understand the changes in horo.rb check rdoc/template.rb in a RDoc 2.x --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 19e532bc0b..7a8c5604b0 100644 --- a/Gemfile +++ b/Gemfile @@ -45,7 +45,7 @@ elsif RUBY_ENGINE == "jruby" end group :documentation do - gem 'rdoc', '2.1' + gem 'rdoc', '2.2' end if ENV['CI'] -- cgit v1.2.3 From 145fbdff67b5fca4d7162b1699d51539399066be Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Wed, 16 Jun 2010 19:24:18 +0200 Subject: 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. --- Gemfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 7a8c5604b0..fe6ef9aa8a 100644 --- a/Gemfile +++ b/Gemfile @@ -5,6 +5,7 @@ gem "rails", :path => File.dirname(__FILE__) gem "rake", ">= 0.8.7" gem "mocha", ">= 0.9.8" +gem "rdoc", "2.2" mri = !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby" if mri && RUBY_VERSION < '1.9' @@ -44,10 +45,6 @@ elsif RUBY_ENGINE == "jruby" end end -group :documentation do - gem 'rdoc', '2.2' -end - if ENV['CI'] gem "nokogiri", ">= 1.4.0" -- cgit v1.2.3