aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides/rails_guides.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-01-12 21:12:44 +0100
committerXavier Noria <fxn@hashref.com>2011-01-12 21:12:44 +0100
commit74188cbff426f35378be876e3c83c798aa6a4a43 (patch)
tree6bc207143149488b1c61da22dc353e565084a145 /railties/guides/rails_guides.rb
parent37bd45f893eda2e59fb5a71f70c568108141edb5 (diff)
downloadrails-74188cbff426f35378be876e3c83c798aa6a4a43.tar.gz
rails-74188cbff426f35378be876e3c83c798aa6a4a43.tar.bz2
rails-74188cbff426f35378be876e3c83c798aa6a4a43.zip
upgrades RedCloth dependency to ~> 4.2, adds RedCloth to the project's Rakefile, removes gem call from the guides generator (use bundle exec if needed)
Diffstat (limited to 'railties/guides/rails_guides.rb')
-rw-r--r--railties/guides/rails_guides.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/guides/rails_guides.rb b/railties/guides/rails_guides.rb
index dfbb06cc76..feb5fe3937 100644
--- a/railties/guides/rails_guides.rb
+++ b/railties/guides/rails_guides.rb
@@ -24,14 +24,14 @@ rescue LoadError
end
begin
- gem 'RedCloth', '>= 4.1.1'
require 'redcloth'
rescue Gem::LoadError
+ # This can happen if doc:guides is executed in an application.
$stderr.puts('Generating guides requires RedCloth 4.1.1+.')
$stderr.puts(<<ERROR) if bundler?
Please add
- gem 'RedCloth', '>= 4.1.1'
+ gem 'RedCloth', '~> 4.2'
to the Gemfile, run