From b6ffb5efcb694a9302453b8d2081f02090a90c62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Tue, 3 Jan 2017 21:51:18 -0500 Subject: Revert "Merge pull request #27550 from mtsmfm/fix-generator-command-for-nested-rails-engine" This reverts commit 1e969bfb98b88799e2c759fce25a1d8cf00d7ce7, reversing changes made to a5041f267ded119c2d00b8786c2f2c1e3f93c8a1. Reason: It breaks the public API --- actionmailer/lib/rails/generators/mailer/mailer_generator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionmailer/lib') diff --git a/actionmailer/lib/rails/generators/mailer/mailer_generator.rb b/actionmailer/lib/rails/generators/mailer/mailer_generator.rb index 519480e881..4a8d0178de 100644 --- a/actionmailer/lib/rails/generators/mailer/mailer_generator.rb +++ b/actionmailer/lib/rails/generators/mailer/mailer_generator.rb @@ -26,7 +26,7 @@ module Rails def application_mailer_file_name @_application_mailer_file_name ||= if mountable_engine? - File.join("app/mailers", namespaced_path, "application_mailer.rb") + "app/mailers/#{namespaced_path}/application_mailer.rb" else "app/mailers/application_mailer.rb" end -- cgit v1.2.3