diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-01-14 11:43:57 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-01-14 11:43:57 -0800 |
| commit | 09035e622f9876cddc558ea065929cb862ca0f13 (patch) | |
| tree | a562054a732e91256ddc4c458ae931be6436d9d1 /activerecord/test/cases/connection_pool_test.rb | |
| parent | c7cf7f476a47c9e4c60a369efa338a1fa9d81d6c (diff) | |
| parent | b23330745bddd6729f95fb8487e3ec4857e4bb58 (diff) | |
| download | rails-09035e622f9876cddc558ea065929cb862ca0f13.tar.gz rails-09035e622f9876cddc558ea065929cb862ca0f13.tar.bz2 rails-09035e622f9876cddc558ea065929cb862ca0f13.zip | |
Merge branch 'master' into set_binds
* master:
don't establish a new connection when testing with `sqlite3_mem`.
sqlite >= 3.8.0 supports partial indexes
Don't try to get the subclass if the inheritance column doesn't exist
Enum mappings are now exposed via class methods instead of constants.
Fix fields_for documentation with index option [ci skip]
quick pass through Active Record CHANGELOG. [ci skip]
[ci skip] Grammar correction
single quotes for controller generated routes
[ci skip] Added alias to CSRF
Set NameError#name
Diffstat (limited to 'activerecord/test/cases/connection_pool_test.rb')
0 files changed, 0 insertions, 0 deletions