Merge commit 'origin/master' into savepoints

2 files changed, 7 insertions, 1 deletions

diff --git a/railties/lib/tasks/databases.rake b/railties/lib/tasks/databases.rake
index a90c1d4a77..3a576063fa 100644
--- a/railties/lib/tasks/databases.rake
+++ b/railties/lib/tasks/databases.rake
@@ -110,7 +110,7 @@ namespace :db do
   end
 
 
-  desc "Migrate the database through scripts in db/migrate. Target specific version with VERSION=x. Turn off output with VERBOSE=false."
+  desc "Migrate the database through scripts in db/migrate and update db/schema.rb by invoking db:schema:dump. Target specific version with VERSION=x. Turn off output with VERBOSE=false."
   task :migrate => :environment do
     ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
     ActiveRecord::Migrator.migrate("db/migrate/", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
diff --git a/railties/lib/tasks/framework.rake b/railties/lib/tasks/framework.rake
index d639214ffe..191c9361ff 100644
--- a/railties/lib/tasks/framework.rake
+++ b/railties/lib/tasks/framework.rake
@@ -80,6 +80,12 @@ namespace :rails do
   desc "Update both configs, scripts and public/javascripts from Rails"
   task :update => [ "update:scripts", "update:javascripts", "update:configs", "update:application_controller" ]
 
+  desc "Applies the template supplied by LOCATION=/path/to/template"
+  task :template do
+    require 'rails_generator/generators/applications/app/template_runner'
+    Rails::TemplateRunner.new(ENV["LOCATION"])
+  end
+
   namespace :update do
     desc "Add new scripts to the application script/ directory"
     task :scripts do