aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/explain_test.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2013-03-20 16:41:01 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2013-03-20 16:41:01 -0700
commitd1577cfe3d7f01f2876e3cbe682065012246697c (patch)
tree0fc5512f74f2c4938c0853d7444fc7112a695c8a /activerecord/test/cases/explain_test.rb
parent38d06478614adcf68a45947cb162c3152e2d7bb1 (diff)
parent2c8f34995378e4a18711cf5f947e8465227d3748 (diff)
downloadrails-d1577cfe3d7f01f2876e3cbe682065012246697c.tar.gz
rails-d1577cfe3d7f01f2876e3cbe682065012246697c.tar.bz2
rails-d1577cfe3d7f01f2876e3cbe682065012246697c.zip
Merge branch '3-2-stable' into fredwu-slow_view_loading_fix
* 3-2-stable: Merge pull request #9802 from newsline/fix-broken-action-missing Remove bad changelog entry from AR [ci skip] Wrong exception is occured when raising no translatable exception Don't crash exception translation w/ nil result attribute. Conflicts: actionpack/CHANGELOG.md
Diffstat (limited to 'activerecord/test/cases/explain_test.rb')
0 files changed, 0 insertions, 0 deletions