aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2013-04-30 07:29:28 -0700
committerXavier Noria <fxn@hashref.com>2013-04-30 07:29:28 -0700
commit24444441b695d0b0d899f486e04dcdfdf9c64085 (patch)
tree98b37a120597a85c90c5ac34224fa581de82c7ee /railties
parent5e8015f5615c47c5233d199cf58bc52de440cb1e (diff)
parent5aec73daf5ea144ac9f2a4e15c6807cc2dcb87b6 (diff)
downloadrails-24444441b695d0b0d899f486e04dcdfdf9c64085.tar.gz
rails-24444441b695d0b0d899f486e04dcdfdf9c64085.tar.bz2
rails-24444441b695d0b0d899f486e04dcdfdf9c64085.zip
Merge pull request #10385 from siong1987/fix_rake_doc_guides
Make `rake doc:guides` works again. Fix #10384.
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/tasks/documentation.rake4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake
index 1c3426028d..f89d6b12e1 100644
--- a/railties/lib/rails/tasks/documentation.rake
+++ b/railties/lib/rails/tasks/documentation.rake
@@ -57,8 +57,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, "/guides/rails_guides"))
RailsGuides::Generator.new(Rails.root.join("doc/guides")).generate
end
end