aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/database_statements_test.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-08-21 14:10:33 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-08-21 14:36:04 -0300
commit648c5a1369ed64608c3ca43a5ebc917687d20010 (patch)
tree834ad77d7aec2718cb6148e6ec6cd0a42a9012fc /activerecord/test/cases/database_statements_test.rb
parentc091fae21f32250b19475f124c3b680dbbc163d9 (diff)
downloadrails-648c5a1369ed64608c3ca43a5ebc917687d20010.tar.gz
rails-648c5a1369ed64608c3ca43a5ebc917687d20010.tar.bz2
rails-648c5a1369ed64608c3ca43a5ebc917687d20010.zip
Merge pull request #5210 from Pliny/masteri
Fix for #5200 Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/counter_cache.rb
Diffstat (limited to 'activerecord/test/cases/database_statements_test.rb')
0 files changed, 0 insertions, 0 deletions