aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'rails/master'Emilio Tagua2009-05-0927-153/+307
|\
| * Tool for profiling resource usage in each require call.Jeremy Kemper2009-05-071-0/+75
| * Whitespace!Joshua Peek2009-05-0714-95/+84
| * Prefer "included" language over "setup"Joshua Peek2009-05-077-30/+33
| * Make module dependency DSL opt inJoshua Peek2009-05-0714-52/+64
| * Add test coverage to module setup extensionsJoshua Peek2009-05-071-0/+74
| * Remove stray call to gems:unpack in gems:build:forceMatt Jones2009-05-061-2/+1
| * Fix tests on 1.8.6Jeremy Kemper2009-05-062-0/+2
| * Fix old reference to ActionController::FailsafeJeremy Kemper2009-05-061-1/+1
* | Refactor to calculations. Migration's versions are string not integer. ARel s...Emilio Tagua2009-05-064-29/+28
* | Merge branch 'master' of git://github.com/rails/railsEmilio Tagua2009-05-0612-102/+105
|\|
| * Cherry pick Active Support dependencies. Autoload.Jeremy Kemper2009-05-0611-81/+100
| * Remove superfluous CGI requireJeremy Kemper2009-05-051-1/+0
| * Prefer sibling Active SupportJeremy Kemper2009-05-051-9/+3
| * Cherry-pick the inflector onlyJeremy Kemper2009-05-051-11/+2
* | Merge commit 'rails/master'Emilio Tagua2009-05-0521-22/+423
|\|
| * assert_redirect_to's partial hash matching was deprecated in 2-3 stable 7f1f1...Joshua Peek2009-05-041-7/+0
| * fix problems with requires in metal choking under development reloading [#257...Tim Connor2009-05-041-1/+2
| * Fix consoleJoshua Peek2009-05-041-2/+3
| * Providing support for :inverse_of as an option to associations.Murray Steele2009-05-0418-12/+418
* | Fixes to have all test passing on PostgreSQL.Emilio Tagua2009-05-043-22/+33
* | 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
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-0430-592/+422
| |\
| | * Wrap dispatcher callbacks around the whole middleware chain. Kill unnecessary...Joshua Peek2009-05-033-38/+22
| | * Show lazy middleware args in pretty printJoshua Peek2009-05-031-2/+1
| | * Extract ActionController rescue templates into Rescue and ShowExceptions midd...Joshua Peek2009-05-0228-556/+403
| * | Don't use #tap before Active Support is available, since older versions of ru...Chris Kampmeier2009-05-041-3/+2
| |/
| * 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 runn...Joshua Peek2009-05-029-58/+66
| | * 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
* | Refactor to use arel_table method, and also use the same method name for inst...Emilio Tagua2009-05-023-21/+18
* | 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
| * Fixed bug with polymorphic has_one :as pointing to an STI recordRuy Asan2009-05-016-5/+21
| * Default scope :order should be overridden by named scopes.Alexander Podgorbunsky2009-05-012-5/+5
| * 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 rol...steve2009-05-011-1/+1
| * Ensure ActiveRecord::Base.connection_pool.with_connection creates a new conne...steve2009-05-012-5/+35
| * Use table_exists? in #initialize_schema_migrations_table [#1923 state:resolved]Ken Collins2009-05-011-2/+2
| * 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