Merge commit 'mainstream/master'

Conflicts:
	actionpack/lib/action_view/helpers/form_helper.rb

7 files changed, 26 insertions, 9 deletions

diff --git a/railties/lib/console_app.rb b/railties/lib/console_app.rb
index 5c8302634a..c944d49205 100644
--- a/railties/lib/console_app.rb
+++ b/railties/lib/console_app.rb
@@ -26,7 +26,8 @@ end
 #reloads the environment
 def reload!
   puts "Reloading..."
-  Dispatcher.cleanup_application
-  Dispatcher.reload_application
+  dispatcher = ActionController::Dispatcher.new
+  dispatcher.cleanup_application
+  dispatcher.reload_application
   true
 end
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index 71366a4480..40000f0dfd 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -264,8 +264,8 @@ module Rails
     # Action Pack, Action Mailer, and Active Resource) are loaded.
     def require_frameworks
       require 'active_support'
-      require 'active_support/core/all'
       configuration.frameworks.each { |framework| require(framework.to_s) }
+      require 'active_support/core/all'
     rescue LoadError => e
       # Re-raise as RuntimeError because Mongrel would swallow LoadError.
       raise e.to_s
@@ -462,7 +462,7 @@ Run `rake gems:install` to install the missing gems.
 
         if RAILS_CACHE.respond_to?(:middleware)
           # Insert middleware to setup and teardown local cache for each request
-          configuration.middleware.insert_after(:"ActionController::Failsafe", RAILS_CACHE.middleware)
+          configuration.middleware.insert_after(:"ActionDispatch::Failsafe", RAILS_CACHE.middleware)
         end
       end
     end
diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb
index 0f924724cd..e66166306a 100644
--- a/railties/lib/rails/plugin.rb
+++ b/railties/lib/rails/plugin.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/kernel/reporting'
+
 module Rails
   # The Plugin class should be an object which provides the following methods:
   #
diff --git a/railties/lib/rails/rack/metal.rb b/railties/lib/rails/rack/metal.rb
index 7a616c7911..b031be29af 100644
--- a/railties/lib/rails/rack/metal.rb
+++ b/railties/lib/rails/rack/metal.rb
@@ -1,5 +1,6 @@
 require 'active_support/ordered_hash'
 require 'active_support/core_ext/class/attribute_accessors'
+require 'active_support/dependencies'
 
 module Rails
   module Rack
@@ -27,7 +28,7 @@ module Rails
 
         load_list.map do |requested_metal|
           if metal = all_metals[requested_metal]
-            require metal
+            require_dependency metal
             requested_metal.constantize
           end
         end.compact
diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
index 2c31d89538..c8c2239f34 100644
--- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb
+++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
@@ -125,6 +125,7 @@ class AppGenerator < Rails::Generator::Base
       create_database_configuration_file(m)
       create_routes_file(m)
       create_locale_file(m)
+      create_seeds_file(m)
       create_initializer_files(m)
       create_environment_files(m)
     end
@@ -176,6 +177,10 @@ class AppGenerator < Rails::Generator::Base
       m.file "configs/routes.rb", "config/routes.rb"
     end
 
+    def create_seeds_file(m)
+      m.file "configs/seeds.rb", "db/seeds.rb"
+    end
+
     def create_initializer_files(m)
       %w( 
         backtrace_silencers 
diff --git a/railties/lib/tasks/databases.rake b/railties/lib/tasks/databases.rake
index 9588fabb2d..cdab5d8bb0 100644
--- a/railties/lib/tasks/databases.rake
+++ b/railties/lib/tasks/databases.rake
@@ -156,8 +156,8 @@ namespace :db do
     Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
   end
 
-  desc 'Drops and recreates the database from db/schema.rb for the current environment.'
-  task :reset => ['db:drop', 'db:create', 'db:schema:load']
+  desc 'Drops and recreates the database from db/schema.rb for the current environment and loads the seeds.'
+  task :reset => [ 'db:drop', 'db:setup' ]
 
   desc "Retrieves the charset for the current environment's database"
   task :charset => :environment do
@@ -206,6 +206,15 @@ namespace :db do
     end
   end
 
+  desc 'Create the database, load the schema, and initialize with the seed data'
+  task :setup => [ 'db:create', 'db:schema:load', 'db:seed' ]
+
+  desc 'Load the seed data from db/seeds.rb'
+  task :seed => :environment do
+    seed_file = File.join(Rails.root, 'db', 'seeds.rb')
+    load(seed_file) if File.exist?(seed_file)
+  end
+
   namespace :fixtures do
     desc "Load fixtures into the current environment's database.  Load specific fixtures using FIXTURES=x,y. Load from subdirectory in test/fixtures using FIXTURES_DIR=z. Specify an alternative path (eg. spec/fixtures) using FIXTURES_PATH=spec/fixtures."
     task :load => :environment do
diff --git a/railties/lib/tasks/gems.rake b/railties/lib/tasks/gems.rake
index efadb1da3b..7cf7061f38 100644
--- a/railties/lib/tasks/gems.rake
+++ b/railties/lib/tasks/gems.rake
@@ -27,8 +27,7 @@ namespace :gems do
     desc "Force the build of all gems"
     task :force do
       $gems_build_rake_task = true
-      Rake::Task['gems:unpack'].invoke
-      current_gems.each { |gem| gem.build(:force => true) }
+      frozen_gems.each { |gem| gem.build(:force => true) }
     end
   end