aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-08-13 02:01:36 -0300
committerGitHub <noreply@github.com>2016-08-13 02:01:36 -0300
commit6107a40c0e4d05614493bddf33d5ae8d9ce8a8d2 (patch)
treecdf641acf1ca536cf9eaac5479c0ceafa5bc1654 /railties/lib/rails
parentafdc2bcc4360197d31ca1d0dc08c14741ce9ca8e (diff)
parent16a257d4d0176dacf186e90eeb4ff1a37e1660af (diff)
downloadrails-6107a40c0e4d05614493bddf33d5ae8d9ce8a8d2.tar.gz
rails-6107a40c0e4d05614493bddf33d5ae8d9ce8a8d2.tar.bz2
rails-6107a40c0e4d05614493bddf33d5ae8d9ce8a8d2.zip
Merge pull request #26146 from bcardarella/bc-clean-up-action-mailer-dirs
Ensure app/mailers is removed when skipping action-mailer
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/generators/rails/app/app_generator.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index bc666b9812..a1b1649547 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -324,6 +324,7 @@ module Rails
remove_file "app/mailers/application_mailer.rb"
remove_file "app/views/layouts/mailer.html.erb"
remove_file "app/views/layouts/mailer.text.erb"
+ remove_dir "app/mailers"
end
end