From 946ad5d9f92af5295305069c4549de79501bdcaa Mon Sep 17 00:00:00 2001 From: Teng Siong Ong Date: Tue, 30 Apr 2013 06:49:03 -0700 Subject: Make `rake doc:guides` works again. Fix #10384. Conflicts: railties/guides/rails_guides.rb railties/lib/rails/tasks/documentation.rake --- railties/lib/rails/tasks/documentation.rake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'railties/lib/rails/tasks') diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake index 1760f526e3..648af722f8 100644 --- a/railties/lib/rails/tasks/documentation.rake +++ b/railties/lib/rails/tasks/documentation.rake @@ -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 -- cgit v1.2.3