Skip to content
Browse files

adds missing requires for arel and i18n, prevents Arel constant from …

…being autoloaded (which was still seen), though it probably hides an issue related to dependencies
  • Loading branch information...
1 parent 9a4fdff commit dd635ec70158b92961b6c5cc729c77ecaf9592be @fxn fxn committed
Showing with 3 additions and 1 deletion.
  1. +3 −1 activerecord/lib/active_record.rb
View
4 activerecord/lib/active_record.rb
@@ -30,6 +30,8 @@
require 'active_support'
require 'active_model'
+require 'arel'
+require 'i18n'
module ActiveRecord
extend ActiveSupport::Autoload
@@ -117,4 +119,4 @@ module ConnectionAdapters
Arel::Table.engine = Arel::Sql::Engine.new(self)
end
-I18n.load_path << File.dirname(__FILE__) + '/active_record/locale/en.yml'
+I18n.load_path << File.dirname(__FILE__) + '/active_record/locale/en.yml'

0 comments on commit dd635ec

Please sign in to comment.
Something went wrong with that request. Please try again.