aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Cherry-pick the inflector onlyJeremy Kemper2009-05-051-11/+2
| * 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
| * 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
| |/
* | Fixed a bug with handling render optionsYehuda Katz + Carl Lerche2009-05-113-66/+12
* | Aliased AbstractController::ActionNotFound to ActionController::UnknownActionYehuda Katz + Carl Lerche2009-05-114-10/+12
* | Ported ConditionalGet to new BaseYehuda Katz + Carl Lerche2009-05-117-5/+102
* | Don't run the action if callbacks are halted.Yehuda Katz + Carl Lerche2009-05-113-5/+13
* | Merge branch 'master' into wip_abstract_controllerYehuda Katz + Carl Lerche2009-05-110-0/+0
|\ \
| * | Makes new callbacks support keys with special charactersYehuda Katz + Carl Lerche2009-04-272-0/+29
* | | Ported fresh_when into a ConditionalGet moduleYehuda Katz + Carl Lerche2009-05-115-0/+92
* | | More community code review :)Yehuda Katz2009-05-118-43/+37
* | | Fix implicit ordering expectationJeremy Kemper2009-05-021-1/+1
* | | Implement FooController.action(:name)Yehuda Katz2009-05-027-34/+57
* | | Get render :inline workingYehuda Katz + Carl Lerche2009-05-013-2/+6
* | | A few more tweaks to get new Base running old render tests againYehuda Katz + Carl Lerche2009-05-013-17/+10
* | | Renamed Base2 to Base and don't require old action_controller for new BaseYehuda Katz + Carl Lerche2009-05-0113-141/+157
* | | Starting to get new_base to run on old testsYehuda Katz + Carl Lerche2009-05-018-3/+313
* | | Add support for stripping "layouts/" from the layout name Yehuda Katz + Carl Lerche2009-05-012-0/+8
* | | Modify new_base to use String action_names for back-compatYehuda Katz + Carl Lerche2009-05-014-8/+8
* | | Committing the last changes before we start trying to get the old tests to pa...Yehuda Katz + Carl Lerche2009-05-013-7/+70
* | | Ported over the concept of public instance methods on controller child classe...Yehuda Katz + Carl Lerche2009-05-015-20/+69
* | | Move ContentType inline for now. Yehuda Katz + Carl Lerche2009-05-014-21/+6
* | | Support implicit and explicit content typesYehuda Katz + Carl Lerche2009-05-016-2/+139
* | | Support implicit render and blank renderYehuda Katz + Carl Lerche2009-05-016-27/+69
* | | Ported over render :template testsYehuda Katz + Carl Lerche2009-05-016-8/+39
* | | Finished implementing render :text in Base2Yehuda Katz + Carl Lerche2009-05-016-8/+54
* | | Renamed the new_base testsYehuda Katz + Carl Lerche2009-05-014-94/+98
* | | Renamed ActionController::AbstractBase to ActionController::HttpYehuda Katz + Carl Lerche2009-05-014-18/+18
* | | Removed a stray method_missing in the new callbacks systemYehuda Katz + Carl Lerche2009-05-011-9/+0
* | | OMG, a lot of workYehuda Katz + Carl Lerche2009-05-0119-86/+210
* | | Makes new callbacks support keys with special charactersYehuda Katz + Carl Lerche2009-05-012-0/+29
| |/ |/|
* | 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