aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@plataformatec.com.br>2012-10-08 05:11:20 -0700
committerJosé Valim <jose.valim@plataformatec.com.br>2012-10-08 05:11:20 -0700
commit28a375a6b83d92367ced8309f6ae153de9e43609 (patch)
treeb5fc157640f6a59a51ce4a765eae24dc77512aa8 /activerecord
parent800604e4452dcc39849cbab087d96c3b7ca44e47 (diff)
parent4756ced051912cf22e7657c446d9a675306bcbda (diff)
downloadrails-28a375a6b83d92367ced8309f6ae153de9e43609.tar.gz
rails-28a375a6b83d92367ced8309f6ae153de9e43609.tar.bz2
rails-28a375a6b83d92367ced8309f6ae153de9e43609.zip
Merge pull request #7872 from kennyj/should_use_app_paths
Should use app.paths instead of specific path.
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/railtie.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb
index b11483de8c..d7e35fb771 100644
--- a/activerecord/lib/active_record/railtie.rb
+++ b/activerecord/lib/active_record/railtie.rb
@@ -129,7 +129,8 @@ module ActiveRecord
end
initializer "active_record.add_watchable_files" do |app|
- config.watchable_files.concat ["#{app.root}/db/schema.rb", "#{app.root}/db/structure.sql"]
+ path = app.paths["db"].first
+ config.watchable_files.concat ["#{path}/schema.rb", "#{path}/structure.sql"]
end
config.after_initialize do |app|