aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/locking_test.rb
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2014-06-04 07:55:59 -0300
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2014-06-04 07:55:59 -0300
commitc5c0bad190dff0495612dde2ac4e33f1ee1fa387 (patch)
tree7a5eb8075773679fc64b12ab32f7aa77ed5c9e97 /activerecord/test/cases/locking_test.rb
parent2a6f4282b91d81dca2c58febc84ed98de9bea466 (diff)
parent2c555ec43ad254ab63cf1e572f999f7521c6cb04 (diff)
downloadrails-c5c0bad190dff0495612dde2ac4e33f1ee1fa387.tar.gz
rails-c5c0bad190dff0495612dde2ac4e33f1ee1fa387.tar.bz2
rails-c5c0bad190dff0495612dde2ac4e33f1ee1fa387.zip
Merge pull request #15482 from laurocaetano/fix-regression-for-eager-load
Fix regression on eager loading association based on SQL query rather than existing column. Conflicts: activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/test/cases/locking_test.rb')
0 files changed, 0 insertions, 0 deletions