1 files changed, 23 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/erb/mailer/mailer_generator.rb b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb
index 66b17bd10e..f9b3658ae7 100644
--- a/railties/lib/rails/generators/erb/mailer/mailer_generator.rb
+++ b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb
@@ -1,8 +1,29 @@
-require 'rails/generators/erb/controller/controller_generator'
+require 'rails/generators/erb'
 
 module Erb # :nodoc:
   module Generators # :nodoc:
-    class MailerGenerator < ControllerGenerator # :nodoc:
+    class MailerGenerator < Base # :nodoc:
+      argument :actions, type: :array, default: [], banner: "method method"
+
+      def copy_view_files
+        view_base_path = File.join("app/views", class_path, file_name)
+        empty_directory view_base_path
+
+        formats.each do |format|
+          layout_path = File.join("app/views/layouts", filename_with_extensions("mailer", format))
+          template filename_with_extensions(:layout, format), layout_path
+        end
+
+        actions.each do |action|
+          @action = action
+
+          formats.each do |format|
+            @path = File.join(view_base_path, filename_with_extensions(action, format))
+            template filename_with_extensions(:view, format), @path
+          end
+        end
+      end
+
       protected
 
       def formats