aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2017-01-31 00:19:51 -0500
committerRafael Mendonça França <rafaelmfranca@gmail.com>2017-01-31 00:20:23 -0500
commitd1e06546499c858db6e16f60c9f0bb7a3fda0a41 (patch)
tree234265b8ebe9bd7eaf776b79ac11217746d9f072 /activerecord
parentcbfbbc671d21793fe6d24af7a7a91373df25e868 (diff)
downloadrails-d1e06546499c858db6e16f60c9f0bb7a3fda0a41.tar.gz
rails-d1e06546499c858db6e16f60c9f0bb7a3fda0a41.tar.bz2
rails-d1e06546499c858db6e16f60c9f0bb7a3fda0a41.zip
Merge pull request #27849 from joevandyk/patch-2
Specify complete path to AR::LegacyYamlAdapter
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb
index 250f48fad9..96b8545dfc 100644
--- a/activerecord/lib/active_record.rb
+++ b/activerecord/lib/active_record.rb
@@ -44,7 +44,6 @@ module ActiveRecord
autoload :Explain
autoload :Inheritance
autoload :Integration
- autoload :LegacyYamlAdapter
autoload :Migration
autoload :Migrator, "active_record/migration"
autoload :ModelSchema
@@ -85,6 +84,8 @@ module ActiveRecord
autoload :AttributeMethods
autoload :AutosaveAssociation
+ autoload :LegacyYamlAdapter
+
autoload :Relation
autoload :AssociationRelation
autoload :NullRelation