aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/rails/generators/active_record/model/model_generator.rb
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 /activerecord/lib/rails/generators/active_record/model/model_generator.rb
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 'activerecord/lib/rails/generators/active_record/model/model_generator.rb')
-rw-r--r--activerecord/lib/rails/generators/active_record/model/model_generator.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/rails/generators/active_record/model/model_generator.rb b/activerecord/lib/rails/generators/active_record/model/model_generator.rb
index 61a8d3c100..cc78fe0db5 100644
--- a/activerecord/lib/rails/generators/active_record/model/model_generator.rb
+++ b/activerecord/lib/rails/generators/active_record/model/model_generator.rb
@@ -59,7 +59,7 @@ module ActiveRecord
def application_record_file_name
@application_record_file_name ||= if mountable_engine?
- "app/models/#{namespaced_path}/application_record.rb"
+ File.join("app/models", namespaced_path, "application_record.rb")
else
"app/models/application_record.rb"
end