aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-05-25 13:43:55 -0700
committerJosé Valim <jose.valim@gmail.com>2011-05-25 13:43:55 -0700
commitd25b7c2eeefff3a0abf7b532c10ce25a71d0fba2 (patch)
tree5553f135c70af807233d5adf7f68e6df3928f1e3 /railties/lib
parent89d06eacf6c5f1bce266a5cdb9f31914cea7fb6d (diff)
parent05adf524c6905eb5ac448e473cc64baa3571fd51 (diff)
downloadrails-d25b7c2eeefff3a0abf7b532c10ce25a71d0fba2.tar.gz
rails-d25b7c2eeefff3a0abf7b532c10ce25a71d0fba2.tar.bz2
rails-d25b7c2eeefff3a0abf7b532c10ce25a71d0fba2.zip
Merge pull request #1305 from amatsuda/require_rdoc_task_fail2
Ensure RDoc::Task exists even if 'rdoc/task' was not required
Diffstat (limited to 'railties/lib')
-rwxr-xr-xrailties/lib/rails/generators/rails/plugin_new/templates/Rakefile2
-rw-r--r--railties/lib/rails/tasks/documentation.rake2
2 files changed, 4 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile b/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile
index 0e4c712acb..b28a842731 100755
--- a/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile
@@ -7,7 +7,9 @@ end
begin
require 'rdoc/task'
rescue LoadError
+ require 'rdoc/rdoc'
require 'rake/rdoctask'
+ RDoc::Task = Rake::RDocTask
end
RDoc::Task.new(:rdoc) do |rdoc|
diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake
index 59305322b7..79255d1f56 100644
--- a/railties/lib/rails/tasks/documentation.rake
+++ b/railties/lib/rails/tasks/documentation.rake
@@ -1,7 +1,9 @@
begin
require 'rdoc/task'
rescue LoadError
+ require 'rdoc/rdoc'
require 'rake/rdoctask'
+ RDoc::Task = Rake::RDocTask
end
# Monkey-patch to remove redoc'ing and clobber descriptions to cut down on rake -T noise