3 files changed, 11 insertions, 5 deletions
diff --git a/railties/lib/rails/tasks/assets.rake b/railties/lib/rails/tasks/assets.rake
index 158df31749..5d2f02af13 100644
--- a/railties/lib/rails/tasks/assets.rake
+++ b/railties/lib/rails/tasks/assets.rake
@@ -2,7 +2,7 @@ namespace :assets do
   desc "Compile all the assets named in config.assets.precompile"
   task :precompile => :environment do
     # Give assets access to asset_path
-    ActionView::Helpers::SprocketsHelper
+    Sprockets::Helpers::RailsHelper
 
     assets = Rails.application.config.assets.precompile
     Rails.application.assets.precompile(*assets)
diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake
index edd716d7d0..79255d1f56 100644
--- a/railties/lib/rails/tasks/documentation.rake
+++ b/railties/lib/rails/tasks/documentation.rake
@@ -1,7 +1,13 @@
-require 'rake/rdoctask'
+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
-class RDocTaskWithoutDescriptions < Rake::RDocTask
+class RDocTaskWithoutDescriptions < RDoc::Task
   def define
     task rdoc_task_name
 
diff --git a/railties/lib/rails/tasks/misc.rake b/railties/lib/rails/tasks/misc.rake
index e505b8c338..833fcb6f72 100644
--- a/railties/lib/rails/tasks/misc.rake
+++ b/railties/lib/rails/tasks/misc.rake
@@ -9,8 +9,8 @@ end
 
 desc 'Generate a cryptographically secure secret key (this is typically used to generate a secret for cookie sessions).'
 task :secret do
-  require 'active_support/secure_random'
-  puts ActiveSupport::SecureRandom.hex(64)
+  require 'securerandom'
+  puts SecureRandom.hex(64)
 end
 
 desc 'List versions of all Rails frameworks and the environment'