aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2017-01-03 21:45:25 -0500
committerGitHub <noreply@github.com>2017-01-03 21:45:25 -0500
commit1e969bfb98b88799e2c759fce25a1d8cf00d7ce7 (patch)
tree289fe880144145088e3839074b691ba35b78a1b5 /actionmailer
parenta5041f267ded119c2d00b8786c2f2c1e3f93c8a1 (diff)
parent085546df456139b6c5d2cde964133e93a0818571 (diff)
downloadrails-1e969bfb98b88799e2c759fce25a1d8cf00d7ce7.tar.gz
rails-1e969bfb98b88799e2c759fce25a1d8cf00d7ce7.tar.bz2
rails-1e969bfb98b88799e2c759fce25a1d8cf00d7ce7.zip
Merge pull request #27550 from mtsmfm/fix-generator-command-for-nested-rails-engine
Fix generator command for nested (namespaced) rails engine
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/lib/rails/generators/mailer/mailer_generator.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/rails/generators/mailer/mailer_generator.rb b/actionmailer/lib/rails/generators/mailer/mailer_generator.rb
index 4a8d0178de..519480e881 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?
- "app/mailers/#{namespaced_path}/application_mailer.rb"
+ File.join("app/mailers", namespaced_path, "application_mailer.rb")
else
"app/mailers/application_mailer.rb"
end