AtHeartEngineer/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-07 22:04:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make rake doc:guides works again. Fix #10384.

Browse Source 
Conflicts:
	railties/guides/rails_guides.rb
	railties/lib/rails/tasks/documentation.rake
This commit is contained in:
Teng Siong Ong
2013-04-30 06:49:03 -07:00
committed by Steve Klabnik
parent 5f8a7d1d4d
commit 946ad5d9f9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
railties/guides/rails_guides.rb
View File

@@ -25,7 +25,7 @@ end
begin
require 'redcloth'
rescue Gem::LoadError
rescue 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?

4
railties/lib/rails/tasks/documentation.rake
View File

@@ -120,8 +120,8 @@ namespace :doc do
# desc "Generate Rails Guides"
task :guides do
# FIXME: Reaching outside lib directory is a bad idea
require File.expand_path('../../../../guides/rails_guides', __FILE__)
rails_gem_dir = Gem::Specification.find_by_name("rails").gem_dir
require File.expand_path(File.join(rails_gem_dir, "railties/guides/rails_guides"))
RailsGuides::Generator.new(Rails.root.join("doc/guides")).generate
end