From 293d35e256d282e3ea9d4d6277611e1e4d50dc96 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 17 Dec 2015 12:47:49 +0100 Subject: ApplicationMailer should be generated by default just like every other Application* parent --- railties/lib/rails/generators/erb/mailer/mailer_generator.rb | 7 ------- railties/lib/rails/generators/erb/mailer/templates/layout.html.erb | 5 ----- railties/lib/rails/generators/erb/mailer/templates/layout.text.erb | 1 - 3 files changed, 13 deletions(-) delete mode 100644 railties/lib/rails/generators/erb/mailer/templates/layout.html.erb delete mode 100644 railties/lib/rails/generators/erb/mailer/templates/layout.text.erb (limited to 'railties/lib/rails/generators/erb') diff --git a/railties/lib/rails/generators/erb/mailer/mailer_generator.rb b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb index 65563aa6db..bc249aa5e5 100644 --- a/railties/lib/rails/generators/erb/mailer/mailer_generator.rb +++ b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb @@ -9,13 +9,6 @@ module Erb # :nodoc: view_base_path = File.join("app/views", class_path, file_name + '_mailer') empty_directory view_base_path - if self.behavior == :invoke - 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 - end - actions.each do |action| @action = action diff --git a/railties/lib/rails/generators/erb/mailer/templates/layout.html.erb b/railties/lib/rails/generators/erb/mailer/templates/layout.html.erb deleted file mode 100644 index 93110e74ad..0000000000 --- a/railties/lib/rails/generators/erb/mailer/templates/layout.html.erb +++ /dev/null @@ -1,5 +0,0 @@ - - - <%%= yield %> - - diff --git a/railties/lib/rails/generators/erb/mailer/templates/layout.text.erb b/railties/lib/rails/generators/erb/mailer/templates/layout.text.erb deleted file mode 100644 index 6363733e6e..0000000000 --- a/railties/lib/rails/generators/erb/mailer/templates/layout.text.erb +++ /dev/null @@ -1 +0,0 @@ -<%%= yield %> -- cgit v1.2.3