diff options
| author | Ryan Garver <ragarver@gmail.com> | 2012-10-02 10:37:27 -0700 |
|---|---|---|
| committer | Ryan Garver <ragarver@gmail.com> | 2012-10-02 10:37:27 -0700 |
| commit | 4cb50a3f571234b1202f9a0dffe39b445ecf807d (patch) | |
| tree | 13780082c3974bc480cf35722cabf8788beed3ab /activerecord/lib/active_record/railtie.rb | |
| parent | 3fdb7126110caad3f3db4c2b44ffc365b51c34eb (diff) | |
| parent | df08271f9c044b7614d70baf4b818f1a79f4a6e1 (diff) | |
| download | rails-4cb50a3f571234b1202f9a0dffe39b445ecf807d.tar.gz rails-4cb50a3f571234b1202f9a0dffe39b445ecf807d.tar.bz2 rails-4cb50a3f571234b1202f9a0dffe39b445ecf807d.zip | |
Merge branch 'master' into feature/public-fragment_name_with_digest
Diffstat (limited to 'activerecord/lib/active_record/railtie.rb')
| -rw-r--r-- | activerecord/lib/active_record/railtie.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index 41b3386c00..b11483de8c 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -10,7 +10,7 @@ require "action_controller/railtie" module ActiveRecord # = Active Record Railtie - class Railtie < Rails::Railtie + class Railtie < Rails::Railtie # :nodoc: config.active_record = ActiveSupport::OrderedOptions.new config.app_generators.orm :active_record, :migration => true, @@ -76,7 +76,7 @@ module ActiveRecord config.after_initialize do |app| ActiveSupport.on_load(:active_record) do filename = File.join(app.config.paths["db"].first, "schema_cache.dump") - + if File.file?(filename) cache = Marshal.load File.binread filename if cache.version == ActiveRecord::Migrator.current_version |