diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-16 21:15:34 -0200 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-16 21:15:34 -0200 |
| commit | 88a296dccc401da143d90cad54b693ff06bf2b58 (patch) | |
| tree | 48fffd9e694b6a9ffb5bed2b921e08edf1824f8c /activerecord/test/cases/locking_test.rb | |
| parent | 666a7e34f553cef4c8878362eafc79c7e3f310c3 (diff) | |
| parent | b6a2baee830f464344b7cb82caaa528be1db7389 (diff) | |
| download | rails-88a296dccc401da143d90cad54b693ff06bf2b58.tar.gz rails-88a296dccc401da143d90cad54b693ff06bf2b58.tar.bz2 rails-88a296dccc401da143d90cad54b693ff06bf2b58.zip | |
Merge pull request #7983 from georgebrock/bug7950-squashed
Backport 4bc2ae0 to fix #7950
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/relation/calculations.rb
Diffstat (limited to 'activerecord/test/cases/locking_test.rb')
0 files changed, 0 insertions, 0 deletions