diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2017-01-03 21:51:18 -0500 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2017-01-03 21:51:18 -0500 |
| commit | b6ffb5efcb694a9302453b8d2081f02090a90c62 (patch) | |
| tree | 7a3e0bcf4cf862bcde23c9420c39a9fb9e13dc77 /activerecord/lib/rails | |
| parent | 1e969bfb98b88799e2c759fce25a1d8cf00d7ce7 (diff) | |
| download | rails-b6ffb5efcb694a9302453b8d2081f02090a90c62.tar.gz rails-b6ffb5efcb694a9302453b8d2081f02090a90c62.tar.bz2 rails-b6ffb5efcb694a9302453b8d2081f02090a90c62.zip | |
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
Diffstat (limited to 'activerecord/lib/rails')
| -rw-r--r-- | activerecord/lib/rails/generators/active_record/model/model_generator.rb | 2 |
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 cc78fe0db5..61a8d3c100 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? - File.join("app/models", namespaced_path, "application_record.rb") + "app/models/#{namespaced_path}/application_record.rb" else "app/models/application_record.rb" end |