aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'rails/master'Emilio Tagua2009-05-0448-703/+570
|\
| * Fixed Hash#from_xml with keys that are all caps.codebrulee2009-05-042-1/+17
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-0430-592/+422
| |\
| | * Wrap dispatcher callbacks around the whole middleware chain. Kill ↵Joshua Peek2009-05-033-38/+22
| | | | | | | | | | | | unnecessary Reloader middleware.
| | * Show lazy middleware args in pretty printJoshua Peek2009-05-031-2/+1
| | |
| | * Extract ActionController rescue templates into Rescue and ShowExceptions ↵Joshua Peek2009-05-0228-556/+403
| | | | | | | | | | | | | | | middleware. This commit breaks all exception catching plugins like ExceptionNotifier. These plugins should be rewritten as middleware instead overriding Controller#rescue_action_in_public.
| * | Don't use #tap before Active Support is available, since older versions of ↵Chris Kampmeier2009-05-041-3/+2
| |/ | | | | | | | | | | | | | | ruby don't have native implementations [#2603 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Fix implicit ordering expectationJeremy Kemper2009-05-021-1/+1
| |
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-0221-105/+132
| |\
| | * Deprecate Controller.process interfaceJoshua Peek2009-05-023-10/+13
| | |
| | * Switch functional tests to run through the rack interface instead of processJoshua Peek2009-05-027-10/+28
| | |
| | * Functional test runner finalizes response just like the integration test ↵Joshua Peek2009-05-029-58/+66
| | | | | | | | | | | | | | | runner. In both runners, the @response object will now behave the same. Some functional tests will need to be updated if they are relying on preprocessed data on the response.
| | * Deprecate assert_redirect_to's partial hash matchingJoshua Peek2009-05-028-28/+26
| | |
| * | Check for sibling Active Support firstJeremy Kemper2009-05-021-8/+3
| |/
* | Revert "Work around count returning string (bug)"Emilio Tagua2009-05-021-1/+1
| | | | | | | | This reverts commit 4bb6f77059a34ea7c8575523397032b4cc67e00a.
* | Refactor to use arel_table method, and also use the same method name for ↵Emilio Tagua2009-05-023-21/+18
| | | | | | | | instance and class methods.
* | Removed ARel table assignmentEmilio Tagua2009-05-021-1/+0
| |
* | Merge commit 'rails/master'Emilio Tagua2009-05-0294-830/+6118
|\|
| * Added routing test for irregular ID requirements and custom member action.Ruy Asan2009-05-011-0/+8
| | | | | | | | | | | | [#2595 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Fixed bug with polymorphic has_one :as pointing to an STI recordRuy Asan2009-05-016-5/+21
| | | | | | | | | | | | [#2594 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Default scope :order should be overridden by named scopes.Alexander Podgorbunsky2009-05-012-5/+5
| | | | | | | | | | | | [#2346 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Rename vendor/rack to vendor/rack-1.1.prePratik Naik2009-05-0152-2/+2
| |
| * Vendor Rack edge ( commit : 815342a8e15db564b766f209ffb1e340233f064f )Pratik Naik2009-05-0152-1/+5418
| |
| * Tests should use ActiveRecord::Base.connection.rollback_db_transaction to ↵steve2009-05-011-1/+1
| | | | | | | | | | | | rollback a transaction Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure ActiveRecord::Base.connection_pool.with_connection creates a new ↵steve2009-05-012-5/+35
| | | | | | | | | | | | connection only when needed [#1752 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Use table_exists? in #initialize_schema_migrations_table [#1923 state:resolved]Ken Collins2009-05-011-2/+2
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Update some old tests to use AC TestProcessJoshua Peek2009-04-301-12/+13
| |
| * alias method chain process with testJoshua Peek2009-04-302-5/+8
| |
| * Move TestRequest#query_parameters into AD TestRequestJoshua Peek2009-04-303-13/+7
| |
| * Selectively require rake sshpublisher so full gem isn't requiredJeremy Kemper2009-04-301-1/+2
| |
| * Explicitly require builder for to_xmlJeremy Kemper2009-04-301-0/+2
| |
| * Set rack.input instead of RAW_POST_DATA in TestRequestJoshua Peek2009-04-301-28/+11
| |
| * Missed stray @request_uriJoshua Peek2009-04-301-2/+0
| |
| * Move TestRequest cookies accessor into AD TestRequestJoshua Peek2009-04-303-5/+36
| |
| * Depend on unreleased rack 1.1Joshua Peek2009-04-305-334/+2
| |
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-04-302-1/+12
| |\
| | * Fix render :json => nil [#2589 state:resolved]Jeremy Kemper2009-04-302-1/+12
| | |
| * | Fix action-cached exception responses.John F. Douthat2009-04-302-1/+44
| |/ | | | | | | | | | | | | | | Methods raising ActiveRecord::RecordNotFound were returning 404 on first request and 200 OK with blank body on subsequent requests. [#2533 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Start moving TestRequest and TestResponse into ActionDispatchJoshua Peek2009-04-3014-253/+279
| |
| * Vendor new Rack::Mock changesJoshua Peek2009-04-308-155/+335
| |
| * Group integration test helpers and delegate other helpers to request and ↵Joshua Peek2009-04-303-158/+136
| | | | | | | | response objects
| * Switch to action_dispatch rack namespace Joshua Peek2009-04-304-5/+5
| |
| * Move generic assertions into ActionDispatchJoshua Peek2009-04-3011-14/+19
| |
| * Test::Unit work arounds are handled by ActiveSupportJoshua Peek2009-04-301-49/+0
| |
| * Framework backtrace cleaning is handled by ActiveSupport nowJoshua Peek2009-04-307-140/+85
| |
* | Updated ARelEmilio Tagua2009-05-021-5/+5
| |
* | Selectively require rake sshpublisher so full gem isn't requiredJeremy Kemper2009-04-301-1/+2
| |
* | Explicitly require builder for to_xmlJeremy Kemper2009-04-301-0/+2
| |
* | Work around count returning string (bug)Jeremy Kemper2009-04-301-1/+1
| |
* | Use public submodule urlJeremy Kemper2009-04-301-1/+1
| |