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 --- .../lib/rails/generators/active_record/model/model_generator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/lib') 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 -- cgit v1.2.3