aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | Defer rake/contrib/sshpublisher require so basic tasks don't need the full ra...Jeremy Kemper2009-05-071-1/+2
| | |/ / /
| * | | | 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
* | | | | | 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