diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-04-25 17:07:55 +1000 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-04-25 17:07:55 +1000 |
| commit | e1b255aca456a5b456111b09237805fd32d15111 (patch) | |
| tree | a87c8b8989449a9dbdf1c6897901f6957ec021dc /activerecord/lib/active_record.rb | |
| parent | 60ab54113fa833a1258d687673561b9474964149 (diff) | |
| parent | a5955196f2ed8a69c49a1a8c0c617ab91cb8d716 (diff) | |
| download | rails-e1b255aca456a5b456111b09237805fd32d15111.tar.gz rails-e1b255aca456a5b456111b09237805fd32d15111.tar.bz2 rails-e1b255aca456a5b456111b09237805fd32d15111.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activerecord/lib/active_record.rb')
| -rw-r--r-- | activerecord/lib/active_record.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index 8a1aa50e24..6a6485f35e 100644 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -29,7 +29,9 @@ activemodel_path = File.expand_path('../../../activemodel/lib', __FILE__) $:.unshift(activemodel_path) if File.directory?(activemodel_path) && !$:.include?(activemodel_path) require 'active_support' +require 'active_support/i18n' require 'active_model' +require 'arel' module ActiveRecord extend ActiveSupport::Autoload @@ -117,4 +119,4 @@ ActiveSupport.on_load(:active_record) do Arel::Table.engine = Arel::Sql::Engine.new(self) end -I18n.load_path << File.dirname(__FILE__) + '/active_record/locale/en.yml'
\ No newline at end of file +I18n.load_path << File.dirname(__FILE__) + '/active_record/locale/en.yml' |