Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Sync 'rails/rails/master' | Yehuda Katz | 2009-01-11 | 18 | -453/+774 |
|\ | |||||
| * | TimeWithZone#xmlschema accepts optional fraction_digits argument [#1725 ↵ | Nicholas Dainty | 2009-01-11 | 3 | -2/+17 |
| | | | | | | | | state:resolved] | ||||
| * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-01-10 | 2 | -201/+171 |
| |\ | |||||
| | * | Refactor request urlencoded params parsing tests | Joshua Peek | 2009-01-10 | 2 | -201/+171 |
| | | | |||||
| * | | Introduce transaction_joinable flag to mark that the fixtures transaction ↵ | Jeremy Kemper | 2009-01-10 | 6 | -47/+45 |
| | | | | | | | | | | | | | | | | | | can't joined, a new savepoint is required even if :requires_new is not set. Use :requires_new option instead of :nest. Update changelog. [#383 state:committed] | ||||
| * | | Merge branch 'master' into savepoints | Jeremy Kemper | 2009-01-10 | 260 | -7401/+9763 |
| |\| | |||||
| | * | Moved query string parsing tests into the request tests folder | Joshua Peek | 2009-01-10 | 1 | -0/+0 |
| | | | |||||
| | * | Refactor request multipart params parsing tests | Joshua Peek | 2009-01-10 | 3 | -169/+167 |
| | | | |||||
| * | | Merge commit 'origin/master' into savepoints | Hongli Lai (Phusion) | 2008-12-09 | 125 | -2294/+5916 |
| |\ \ | |||||
| * \ \ | Merge commit 'origin/master' into savepoints | Hongli Lai (Phusion) | 2008-12-03 | 603 | -17183/+13060 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/fixtures.rb activerecord/test/cases/defaults_test.rb | ||||
| * | | | | Reimplement Jeremy's PostgreSQL automatic transaction state introspection code. | Hongli Lai (Phusion) | 2008-11-03 | 3 | -2/+62 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed compatibility with the old 'postgres' driver which doesn't support transaction state introspection. - Added unit tests for it. | ||||
| * | | | | Rename ActiveRecord::Base#transaction's :force option to :nest. Improve ↵ | Hongli Lai (Phusion) | 2008-11-03 | 2 | -7/+62 |
| | | | | | | | | | | | | | | | | | | | | documentation for nested transactions. | ||||
| * | | | | Make SQLite3 pass the unit tests for savepoints. | Hongli Lai (Phusion) | 2008-11-03 | 4 | -4/+18 |
| | | | | | |||||
| * | | | | Fix a stale typo in the PostgreSQL adapter. Fix a stale mock expection in ↵ | Hongli Lai (Phusion) | 2008-11-03 | 2 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | transaction_test. | ||||
| * | | | | Revert "PostgreSQL: introduce transaction_active? rather than tracking ↵ | Hongli Lai (Phusion) | 2008-11-03 | 1 | -38/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | activity ourselves" This commit conflicts with savepoint support. This reverts commit 045713ee240fff815edb5962b25d668512649478. Conflicts: activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | ||||
| * | | | | Fix the final MySQL unit test failure that's related to savepoint support. | Hongli Lai (Phusion) | 2008-11-03 | 1 | -28/+39 |
| | | | | | |||||
| * | | | | Improve documentation for DatabaseStatements#transactions and ↵ | Hongli Lai (Phusion) | 2008-11-03 | 3 | -6/+74 |
| | | | | | | | | | | | | | | | | | | | | AbstractAdapter#transactional_fixtures, especially with regard to support for nested transactions. | ||||
| * | | | | Fix assert_queries failures by ignoring savepoint sql. | Jonathan Viney | 2008-11-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix what looks like a Mysql bug with transactions, savepoints, and create table. | Jonathan Viney | 2008-11-03 | 1 | -21/+26 |
| | | | | | |||||
| * | | | | Implement savepoints. | Jonathan Viney | 2008-11-03 | 7 | -14/+185 |
| | | | | | |||||
* | | | | | Sync 'rails/rails/master' | Yehuda Katz | 2009-01-09 | 7 | -213/+269 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Refactor request xml params parsing tests | Joshua Peek | 2009-01-09 | 2 | -54/+88 |
| | | | | | |||||
| * | | | | Refactor request json params parsing tests | Joshua Peek | 2009-01-09 | 2 | -22/+45 |
| | | | | | |||||
| * | | | | Ensure we override Rack::Request's POST method too | Joshua Peek | 2009-01-09 | 2 | -2/+7 |
| | | | | | |||||
| * | | | | Refactor request query string parsing tests | Joshua Peek | 2009-01-09 | 3 | -106/+122 |
| | | | | | |||||
| * | | | | Inherit ActionController::Request from Rack::Request | Joshua Peek | 2009-01-09 | 2 | -29/+7 |
| | | | | | |||||
| * | | | | Process time should be wall time when benchmarking | Pratik Naik | 2009-01-09 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix test broken by test process changes | Jeremy Kemper | 2009-01-07 | 1 | -7/+4 |
| | | | | | |||||
| * | | | | Remove Content-Length header from :no_content responses | Jeremy Kemper | 2009-01-07 | 2 | -4/+12 |
| | | | | | |||||
| * | | | | Set assigns for integration tests also | Jeremy Kemper | 2009-01-07 | 1 | -2/+5 |
| | | | | | |||||
| * | | | | Take care not to mix in public methods | Jeremy Kemper | 2009-01-07 | 1 | -9/+10 |
| | | | | | |||||
| * | | | | Use instance_eval instead of adding an accessor to the class | Jeremy Kemper | 2009-01-07 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | Include process methods in ActionController::TestCase only. No need to ↵ | Jeremy Kemper | 2009-01-07 | 13 | -82/+60 |
| | | | | | | | | | | | | | | | | | | | | alias_method_chain :process either. | ||||
| * | | | | Object#tap for Ruby < 1.8.7 | Jeremy Kemper | 2009-01-07 | 3 | -0/+26 |
| | | | | | |||||
| * | | | | Fix JSON decoder date-converter regexp [#1662 state:resolved] [Jonathan del ↵ | Pratik Naik | 2009-01-07 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | Strother] | ||||
| * | | | | Spam people with commit rights on test failures. | Michael Koziarski | 2009-01-07 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Update CI configuration to reflect latest gems. | Mike Gunderloy | 2009-01-07 | 4 | -9/+28 |
| | | | | | |||||
* | | | | | Fix test broken by test process changes | Jeremy Kemper | 2009-01-09 | 1 | -7/+4 |
| | | | | | |||||
* | | | | | Remove Content-Length header from :no_content responses | Jeremy Kemper | 2009-01-09 | 2 | -4/+12 |
| | | | | | |||||
* | | | | | Set assigns for integration tests also | Jeremy Kemper | 2009-01-09 | 1 | -2/+5 |
| | | | | | |||||
* | | | | | Take care not to mix in public methods | Jeremy Kemper | 2009-01-09 | 1 | -9/+10 |
| | | | | | |||||
* | | | | | Use instance_eval instead of adding an accessor to the class | Jeremy Kemper | 2009-01-09 | 1 | -2/+1 |
| | | | | | |||||
* | | | | | Include process methods in ActionController::TestCase only. No need to ↵ | Jeremy Kemper | 2009-01-09 | 13 | -82/+60 |
| | | | | | | | | | | | | | | | | | | | | alias_method_chain :process either. | ||||
* | | | | | Object#tap for Ruby < 1.8.7 | Jeremy Kemper | 2009-01-09 | 3 | -0/+26 |
| | | | | | |||||
* | | | | | Fix JSON decoder date-converter regexp [#1662 state:resolved] [Jonathan del ↵ | Pratik Naik | 2009-01-09 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | Strother] | ||||
* | | | | | Spam people with commit rights on test failures. | Michael Koziarski | 2009-01-09 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Update CI configuration to reflect latest gems. | Mike Gunderloy | 2009-01-09 | 4 | -9/+28 |
| | | | | | |||||
* | | | | | Sync 'rails/rails/master' | Yehuda Katz | 2009-01-06 | 7 | -9/+15 |
|\| | | | | |||||
| * | | | | Fix failing flash test | Jeremy Kemper | 2009-01-06 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-01-06 | 4 | -6/+11 |
| |\ \ \ \ |