diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2015-12-17 12:47:49 +0100 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-12-17 17:35:20 -0200 |
| commit | 293d35e256d282e3ea9d4d6277611e1e4d50dc96 (patch) | |
| tree | 90b07e3578136f269563f4bb9203c84e8c16fd21 /railties/lib/rails/generators/erb | |
| parent | 80ba81d2a05987681301f40804469a7cf42ed4fe (diff) | |
| download | rails-293d35e256d282e3ea9d4d6277611e1e4d50dc96.tar.gz rails-293d35e256d282e3ea9d4d6277611e1e4d50dc96.tar.bz2 rails-293d35e256d282e3ea9d4d6277611e1e4d50dc96.zip | |
ApplicationMailer should be generated by default just like every other Application* parent
Diffstat (limited to 'railties/lib/rails/generators/erb')
3 files changed, 0 insertions, 13 deletions
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 @@ -<html> - <body> - <%%= yield %> - </body> -</html> 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 %> |