aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Don't assume :params is a HashJeremy Kemper2009-04-261-4/+1
| * Check for to_str rather than StringJeremy Kemper2009-04-261-3/+1
| * Don't undefine object_idJeremy Kemper2009-04-261-1/+1
| * Privatize rails_to_jsonJeremy Kemper2009-04-2616-157/+171
| * Extract json string escapingJeremy Kemper2009-04-262-38/+33
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-04-2676-5614/+499
| |\
| | * Inherit TestSession from Session::AbstractStore and add indifferent access to...Joshua Peek2009-04-2610-125/+67
| | * Require an ActionDispatch::Request to use response assertionsJoshua Peek2009-04-261-6/+18
| | * Unify functional and integration tests cookie helpersJoshua Peek2009-04-262-22/+13
| | * Fix environment variable testing code in failsafe.rb.Hongli Lai (Phusion)2009-04-261-1/+1
| | * Remove reference to Rack::RewindableInput, which has been removed a while ago.Hongli Lai (Phusion)2009-04-261-1/+1
| | * Fix typo in stale session check [#2404 state:resolved]Joshua Peek2009-04-261-1/+1
| | * Deprecate response.redirect_url_match?, use assert_match instead.Joshua Peek2009-04-262-4/+7
| | * Move useful response test helpers into requestJoshua Peek2009-04-264-64/+116
| | * Create a new file for response testsJoshua Peek2009-04-262-90/+83
| | * Updated for Rack 1.0Yehuda Katz2009-04-251-1/+1
| | * Remove RewindableInput middleware since all input MUST be rewindable accordin...Joshua Peek2009-04-255-120/+0
| | * Remove vendored version of RackJoshua Peek2009-04-2553-5007/+8
| | * Remove pending rack specifications until they are officialJoshua Peek2009-04-253-6/+4
| | * Start to integrate some of the features in Rack::Test.Joshua Peek2009-04-246-179/+192
| * | Only Object to_json alias is needed. Prefer nil options.Jeremy Kemper2009-04-2615-35/+12
| * | Qualify toplevel constant references since we're in a BasicObjectJeremy Kemper2009-04-261-7/+7
| * | Track object ids so the objects needn't respond to ==Jeremy Kemper2009-04-261-2/+2
| * | test uses PathnameJeremy Kemper2009-04-241-0/+1
| |/
* | Calculations now use Arel to construct the query.Emilio Tagua2009-04-299-166/+154
* | construct_finder_sql now use ArelEmilio Tagua2009-04-246-30/+95
* | Refactored locking updateEmilio Tagua2009-04-241-7/+9
* | Merge commit 'rails/master'Emilio Tagua2009-04-245-13/+14
|\|
| * Use Symbol#to_proc in rails plugin internalsJeremy Kemper2009-04-241-0/+1
| * Fix models load order to be able to run unit tests.Emilio Tagua2009-04-234-13/+13
* | Changed locking to use Arel. Arel updatedEmilio Tagua2009-04-242-19/+24
* | Added ruby-debugEmilio Tagua2009-04-241-0/+3
* | Remove connection method definition, since it's called just once.Emilio Tagua2009-04-231-5/+1
* | More progress on migrations. Arel updated.Emilio Tagua2009-04-232-6/+7
* | Added Arel integration to migration's version update tableEmilio Tagua2009-04-231-25/+25
* | Arel updatedEmilio Tagua2009-04-231-5/+5
* | Removed blank linesEmilio Tagua2009-04-231-2/+0
* | Require ArelEmilio Tagua2009-04-231-0/+5
* | Added arel as a submodule. This is temporary and will make development/testin...Emilio Tagua2009-04-232-0/+9
|/
* * Add pluggable JSON backends with support for the JSON gem. [rick]rick2009-04-2332-239/+384
* Removed rest of Symbol#to_proc from railties testsJeremy Kemper2009-04-222-3/+3
* Missed oneJeremy Kemper2009-04-221-1/+1
* Remove Symbol#to_proc dependencyJeremy Kemper2009-04-221-2/+2
* Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-04-2226-114/+165
|\
| * Refactor ActionView::PathYehuda Katz + Carl Lerche2009-04-2226-114/+165
* | Fix dependencies revealed by testing in isolationJeremy Kemper2009-04-2261-32/+127
* | new_callbacks core extensionsJeremy Kemper2009-04-222-5/+8
|/
* Fix tests on 1.9Jeremy Kemper2009-04-224-2/+6
* Merge branch 'master' into cherryJeremy Kemper2009-04-225-1/+7
|\
| * Opt in to JSONJeremy Kemper2009-04-225-1/+7