aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2013-02-23 13:10:28 -0800
committerGuillermo Iguaran <guilleiguaran@gmail.com>2013-02-23 13:10:28 -0800
commitdcfa3205d519ce2812d5605bc7a113897fc438d3 (patch)
tree5842f9b3bf11e7647d4bbc7722c2e02876558c09 /railties/lib
parent87c029e4dff7c15ab6faae3cce5b9aa91cf480f3 (diff)
parent549ced9c10974a97b6db8ce0adfbac999a813644 (diff)
downloadrails-dcfa3205d519ce2812d5605bc7a113897fc438d3.tar.gz
rails-dcfa3205d519ce2812d5605bc7a113897fc438d3.tar.bz2
rails-dcfa3205d519ce2812d5605bc7a113897fc438d3.zip
Merge pull request #9393 from rubys/master
guides/rails_guides moved up and out of the railties directory
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/tasks/documentation.rake2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake
index ea6c074bdc..0057b0f887 100644
--- a/railties/lib/rails/tasks/documentation.rake
+++ b/railties/lib/rails/tasks/documentation.rake
@@ -102,7 +102,7 @@ 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__)
+ require File.expand_path('../../../../../guides/rails_guides', __FILE__)
RailsGuides::Generator.new(Rails.root.join("doc/guides")).generate
end
end