aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/relation/merging_test.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-11-17 11:50:09 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-11-17 11:50:09 -0200
commit549577193875e151b9afab28bf32e86e879a53a6 (patch)
treefb01fe5ed7a133120eed082bf186d03345d718e6 /activerecord/test/cases/relation/merging_test.rb
parent8fd5592beefc07935443f01e6c8cda47d0c8d24c (diff)
parentc3e8d15e8babd8c27aa04ced8cde40fdc124416a (diff)
downloadrails-549577193875e151b9afab28bf32e86e879a53a6.tar.gz
rails-549577193875e151b9afab28bf32e86e879a53a6.tar.bz2
rails-549577193875e151b9afab28bf32e86e879a53a6.zip
Merge pull request #17642 from tgxworld/fix_template_assertion_on_assigns
Fix for assigns(:..) resetting template assertions
Diffstat (limited to 'activerecord/test/cases/relation/merging_test.rb')
0 files changed, 0 insertions, 0 deletions