aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/tasks
diff options
context:
space:
mode:
authorAkira Matsuda <ronnie@dio.jp>2011-05-26 00:15:23 +0900
committerAkira Matsuda <ronnie@dio.jp>2011-05-26 00:15:23 +0900
commit24b28a2a0c6a58e177b07ce3ccf56dc975541780 (patch)
tree16eb9c8879573b1f90fea2ddf5144745a7bac120 /railties/lib/rails/tasks
parent41eac9b3f6b4a38de3b4c38e5b8d9f0e6b3cb08a (diff)
downloadrails-24b28a2a0c6a58e177b07ce3ccf56dc975541780.tar.gz
rails-24b28a2a0c6a58e177b07ce3ccf56dc975541780.tar.bz2
rails-24b28a2a0c6a58e177b07ce3ccf56dc975541780.zip
require 'rake/rdoctask' if failed to require 'rdoc/task'
fixes a regression introduced by b921679d0dd3d5ca16f0362c2b34e7703cfe15e5 require 'rdoc/task' fails if the system RDoc version is below 2.4.2 (e.g. CRuby 1.8.7)
Diffstat (limited to 'railties/lib/rails/tasks')
-rw-r--r--railties/lib/rails/tasks/documentation.rake6
1 files changed, 5 insertions, 1 deletions
diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake
index c8b4040151..59305322b7 100644
--- a/railties/lib/rails/tasks/documentation.rake
+++ b/railties/lib/rails/tasks/documentation.rake
@@ -1,4 +1,8 @@
-require 'rdoc/task'
+begin
+ require 'rdoc/task'
+rescue LoadError
+ require 'rake/rdoctask'
+end
# Monkey-patch to remove redoc'ing and clobber descriptions to cut down on rake -T noise
class RDocTaskWithoutDescriptions < RDoc::Task