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
| |/
| * 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
| * 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
| * 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 10:27:14 +0000