aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge branch 'master' into wip_abstract_controllerYehuda Katz + Carl Lerche2009-05-11125-930/+1539
| |\
| | * Revert "Whitespace!"Yehuda Katz + Carl Lerche2009-05-1114-84/+95
| | * Revert "Fixed bug with polymorphic has_one :as pointing to an STI record"Jeremy Kemper2009-05-116-21/+5
| | * ActiveSupport::OrderedHash[1,2,3,4] creates an OrderedHash instead of a Hash.Douglas F Shearer2009-05-112-0/+16
| | * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-1117-13/+173
| | |\
| | | * Added db/seeds.rb as a default file for storing seed data for the database. C...David Heinemeier Hansson2009-05-115-2/+31
| | | * Change spelling of Kyev timezone to Kyiv [#2613 state:resolved]Alexander Dymo2009-05-102-2/+4
| | | * Allow you to pass :all_blank to :reject_if option to automatically create a P...Mike Breen2009-05-104-2/+30
| | | * Fixed eager load error on find with include => [:table_name] and hash conditi...Anthony Crumley2009-05-102-4/+28
| | | * ActiveSupport::OrderedHash#to_a method returns an ordered set of arrays. Matc...Ken Collins2009-05-102-0/+8
| | | * honour :inverse_of for joins based includeFrederick Cheung2009-05-102-2/+36
| | | * honour inverse_of when preloading associationsFrederick Cheung2009-05-102-1/+36
| | * | Check for date/time methods that moved upstream in 1.9Jeremy Kemper2009-05-073-6/+6
| | * | 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