aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@plataformatec.com.br>2012-07-26 03:13:07 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-08-06 17:44:55 -0300
commit29fb31f561502b66dd319ff864b184a222e1395b (patch)
tree615c22b13a4e1b4910b4218e8b8233bed8fe4906 /activerecord
parent3cc872d483c2d4414603bc539ae36725a6bb062a (diff)
downloadrails-29fb31f561502b66dd319ff864b184a222e1395b.tar.gz
rails-29fb31f561502b66dd319ff864b184a222e1395b.tar.bz2
rails-29fb31f561502b66dd319ff864b184a222e1395b.zip
Merge pull request #7167 from route/missed_extend
Missed extend for eager_autoload This backport is trying to fix a bug with eager load ActiveRecord::Associations modules
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/associations.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index 8ebb27b682..5aa9e26fa6 100644
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -105,6 +105,7 @@ module ActiveRecord
# See ActiveRecord::Associations::ClassMethods for documentation.
module Associations # :nodoc:
+ extend ActiveSupport::Autoload
extend ActiveSupport::Concern
# These classes will be loaded when associations are created.