aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/template/test_test.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-08-19 08:28:57 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-08-19 08:28:57 -0700
commit1dbf1c80ac4693634f536b410e7d4910cc2e173f (patch)
tree687385bd46b8a6d0761ea35fc82e9e6417c5eccb /actionpack/test/template/test_test.rb
parentf9fc26e8007d5e2936cf5374a8168b2c37273490 (diff)
parentbf80522be4d7ac521fa3c30d889afa68450a0bc2 (diff)
downloadrails-1dbf1c80ac4693634f536b410e7d4910cc2e173f.tar.gz
rails-1dbf1c80ac4693634f536b410e7d4910cc2e173f.tar.bz2
rails-1dbf1c80ac4693634f536b410e7d4910cc2e173f.zip
Merge pull request #7392 from ernie/real-fix-for-last-equality-wins-in-merge
Fix "last equality wins" logic in relation merge
Diffstat (limited to 'actionpack/test/template/test_test.rb')
0 files changed, 0 insertions, 0 deletions