diff options
| author | José Valim <jose.valim@gmail.com> | 2010-11-11 19:39:21 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-11-11 19:39:21 +0100 |
| commit | f912a359aaaffa04fedb2ffd5730284d629b481a (patch) | |
| tree | ee0163b662d378ba9dfe327cbbe17f3cde07790c /activerecord | |
| parent | de2933e1a062f0752512eb0ec60f7217f4890f8c (diff) | |
| parent | cc135e3b6df1785852de2470b4b93559c88c891e (diff) | |
| download | rails-f912a359aaaffa04fedb2ffd5730284d629b481a.tar.gz rails-f912a359aaaffa04fedb2ffd5730284d629b481a.tar.bz2 rails-f912a359aaaffa04fedb2ffd5730284d629b481a.zip | |
Merge remote branch 'drogus/plugin_new'
Conflicts:
railties/test/generators/app_generator_test.rb
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/railtie.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index 868fd6c3ff..dfe255ad7c 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -14,7 +14,7 @@ module ActiveRecord config.active_record = ActiveSupport::OrderedOptions.new config.app_generators.orm :active_record, :migration => true, - :timestamps => true + :timestamps => true config.app_middleware.insert_after "::ActionDispatch::Callbacks", "ActiveRecord::QueryCache" |