Merge commit 'mainstream/master'

Conflicts:
	actionpack/lib/action_controller/base/mime_responds.rb

2 files changed, 6 insertions, 6 deletions

diff --git a/railties/lib/tasks/gems.rake b/railties/lib/tasks/gems.rake
index 7cf7061f38..e496e1a04f 100644
--- a/railties/lib/tasks/gems.rake
+++ b/railties/lib/tasks/gems.rake
@@ -20,7 +20,7 @@ namespace :gems do
   desc "Build any native extensions for unpacked gems"
   task :build do
     $gems_build_rake_task = true
-    frozen_gems.each &:build
+    frozen_gems.each {|gem| gem.build }
   end
 
   namespace :build do
@@ -33,12 +33,12 @@ namespace :gems do
 
   desc "Installs all required gems."
   task :install => :base do
-    current_gems.each &:install
+    current_gems.each {|gem| gem.install }
   end
 
   desc "Unpacks all required gems into vendor/gems."
   task :unpack => :install do
-    current_gems.each &:unpack
+    current_gems.each {|gem| gem.unpack }
   end
 
   namespace :unpack do
@@ -50,7 +50,7 @@ namespace :gems do
 
   desc "Regenerate gem specifications in correct format."
   task :refresh_specs => :base do
-    current_gems.each &:refresh
+    current_gems.each {|gem| gem.refresh }
   end
 end
 
diff --git a/railties/lib/tasks/misc.rake b/railties/lib/tasks/misc.rake
index a2c338aa5b..fb2fc31dc1 100644
--- a/railties/lib/tasks/misc.rake
+++ b/railties/lib/tasks/misc.rake
@@ -31,7 +31,7 @@ namespace :time do
     desc 'Displays names of time zones recognized by the Rails TimeZone class with the same offset as the system local time'
     task :local do
       require 'active_support'
-      require 'active_support/core/time'
+      require 'active_support/time'
       jan_offset = Time.now.beginning_of_year.utc_offset
       jul_offset = Time.now.beginning_of_year.change(:month => 7).utc_offset
       offset = jan_offset < jul_offset ? jan_offset : jul_offset
@@ -41,7 +41,7 @@ namespace :time do
     # to find UTC -06:00 zones, OFFSET can be set to either -6, -6:00 or 21600
     def build_time_zone_list(method, offset = ENV['OFFSET'])
       require 'active_support'
-      require 'active_support/core/time'
+      require 'active_support/time'
       if offset
         offset = if offset.to_s.match(/(\+|-)?(\d+):(\d+)/)
           sign = $1 == '-' ? -1 : 1