Skip to content
Browse files

cherry picked 05adf52 for 3-0-stable. Original Author: amatsuda

  • Loading branch information...
1 parent 81b01b7 commit bbfd65299f258fa85042c01fe2d8985d69588417 @vijaydev vijaydev committed
View
6 Rakefile
@@ -2,11 +2,7 @@ gem 'rdoc', '>= 2.5.10'
require 'rdoc'
require 'rake'
-begin
- require 'rdoc/task'
-rescue LoadError
- require 'rake/rdoctask'
-end
+require 'rdoc/task'
$:.unshift File.expand_path('..', __FILE__)
require "tasks/release"
View
2 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
View
7 railties/test/railties/railtie_test.rb
@@ -85,12 +85,7 @@ class MyTie < Rails::Railtie
assert !$ran_block
require 'rake'
require 'rake/testtask'
- begin
- require 'rdoc/task'
- rescue LoadError
- require 'rake/rdoctask'
- end
-
+ require 'rdoc/task'
AppTemplate::Application.load_tasks
assert $ran_block
View
6 railties/test/railties/shared_tests.rb
@@ -170,11 +170,7 @@ def test_rake_tasks_lib_tasks_are_loaded
boot_rails
require 'rake'
- begin
- require 'rdoc/task'
- rescue LoadError
- require 'rake/rdoctask'
- end
+ require 'rdoc/task'
require 'rake/testtask'
Rails.application.load_tasks
Rake::Task[:foo].invoke

0 comments on commit bbfd652

Please sign in to comment.
Something went wrong with that request. Please try again.