Merge commit 'rails/master'

Conflicts:
	activerecord/lib/active_record/associations.rb

1 files changed, 14 insertions, 0 deletions

diff --git a/railties/lib/generators/rails/mailer/mailer_generator.rb b/railties/lib/generators/rails/mailer/mailer_generator.rb
new file mode 100644
index 0000000000..33f1665b83
--- /dev/null
+++ b/railties/lib/generators/rails/mailer/mailer_generator.rb
@@ -0,0 +1,14 @@
+module Rails
+  module Generators
+    class MailerGenerator < NamedBase
+      argument :actions, :type => :array, :default => [], :banner => "method method"
+      check_class_collision
+
+      def create_mailer_file
+        template "mailer.rb", File.join('app/models', class_path, "#{file_name}.rb")
+      end
+
+      hook_for :template_engine, :test_framework
+    end
+  end
+end