Merge remote branch 'rails/master'

3 files changed, 10 insertions, 2 deletions

diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index ee0fca6592..0becb780de 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -28,6 +28,10 @@ module Rails
         @operations << [:use, args, block]
       end
 
+      def delete(*args, &block)
+        @operations << [:delete, args, block]
+      end
+
       def merge_into(other)
         @operations.each do |operation, args, block|
           other.send(operation, *args, &block)
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index af92757053..f4990bfb4c 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -178,6 +178,7 @@ module Rails
           "#{orm}:migration",
           "#{orm}:model",
           "#{orm}:observer",
+          "#{orm}:session_migration",
           "#{test}:controller",
           "#{test}:helper",
           "#{test}:integration",
@@ -186,8 +187,11 @@ module Rails
           "#{test}:observer",
           "#{test}:scaffold",
           "#{test}:view",
+          "#{test}:performance",
+          "#{test}:plugin",
           "#{template}:controller",
-          "#{template}:scaffold"
+          "#{template}:scaffold",
+          "#{template}:mailer"
         ]
       end
     end
diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb
index c10876134a..34d96fd0f3 100644
--- a/railties/lib/rails/version.rb
+++ b/railties/lib/rails/version.rb
@@ -3,7 +3,7 @@ module Rails
     MAJOR = 3
     MINOR = 0
     TINY  = 0
-    BUILD = "beta3"
+    BUILD = "beta4"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
   end