Merge commit 'rails/master'

Conflicts:
	activerecord/lib/active_record/associations.rb

1 files changed, 20 insertions, 0 deletions

diff --git a/railties/lib/generators/erb/mailer/mailer_generator.rb b/railties/lib/generators/erb/mailer/mailer_generator.rb
new file mode 100644
index 0000000000..4ec2f4c9f4
--- /dev/null
+++ b/railties/lib/generators/erb/mailer/mailer_generator.rb
@@ -0,0 +1,20 @@
+require 'generators/erb'
+
+module Erb
+  module Generators
+    class MailerGenerator < Base
+      argument :actions, :type => :array, :default => [], :banner => "method method"
+
+      def create_view_folder
+        empty_directory File.join("app/views", file_path)
+      end
+
+      def create_view_files
+        actions.each do |action|
+          @action, @path = action, File.join(file_path, action)
+          template "view.erb", File.join("app/views", "#{@path}.erb")
+        end
+      end
+    end
+  end
+end