diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-05-17 20:46:48 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-05-17 20:46:48 -0700 |
commit | 4d119ce594d4d1d3eb5f18aacda13f81b7e0a136 (patch) | |
tree | ab66fd93ffa3835338714c4d62126c5c7f459264 /activerecord/test/cases/adapters | |
parent | 3cb2c14f87c536fde0b04d6b14385d3b730a84ff (diff) | |
parent | 1ff53413852db94476d4851e1535669b953c9393 (diff) | |
download | rails-4d119ce594d4d1d3eb5f18aacda13f81b7e0a136.tar.gz rails-4d119ce594d4d1d3eb5f18aacda13f81b7e0a136.tar.bz2 rails-4d119ce594d4d1d3eb5f18aacda13f81b7e0a136.zip |
Merge branch 'master' into experiment
* master:
stop swallowing exceptions in assert_queries. Methods that raise an exception are unlikely to pass this assertion, but since the assertions raise an exception, the original exception is lost.
Bug fix: Evented notification subscribers can handle published events
Diffstat (limited to 'activerecord/test/cases/adapters')
0 files changed, 0 insertions, 0 deletions