aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Refactored AbstractController to provide better hook points for overriding as...Yehuda Katz + Carl Lerche2009-05-155-33/+39
* Allow strings to be sent as collection to select.José Valim2009-05-152-0/+24
* Merge commit 'origin/master'Yehuda Katz + Carl Lerche2009-05-1411-16/+65
|\
| * Minimal base/new_base comparisonJeremy Kemper2009-05-146-21/+50
| * Cherry-picking Active Support extensionsJeremy Kemper2009-05-142-2/+5
| * Simple example for require profilingJeremy Kemper2009-05-141-0/+17
| * Changed ActiveRecord::Base#exists? to invoke find_initial so that it is compa...Peter Marklund2009-05-142-8/+9
* | Got new base to pass controller/base_test.rb, implemented method_missing acti...Yehuda Katz + Carl Lerche2009-05-148-11/+61
* | Cleaning up more render testsYehuda Katz + Carl Lerche2009-05-1411-33/+122
|/
* Ported over render :file tests.Yehuda Katz + Carl Lerche2009-05-138-321/+585
* Simple examples for require profilingJeremy Kemper2009-05-133-2/+32
* Cherry-pick core extensionsJeremy Kemper2009-05-1371-83/+168
* isolated_test taskJeremy Kemper2009-05-132-6/+20
* Remove support for deprecated validation message interpolation formatJeremy Kemper2009-05-133-53/+8
* Preserve orderingJeremy Kemper2009-05-131-2/+8
* Defer rake/contrib requires so we can use the stdlib rake instead of the full...Jeremy Kemper2009-05-132-2/+4
* Implemented redirects and partial rendering in new base.Yehuda Katz + Carl Lerche2009-05-1220-102/+251
* Fixed new callbacks to not call the action when a callback sets the response ...Yehuda Katz + Carl Lerche2009-05-122-1/+20
* Defer rake/contrib/sshpublisher require so we can use the stdlib rake instead...Jeremy Kemper2009-05-111-1/+2
* Use DependencyModule for included hooks in ActiveRecordBryan Helmkamp2009-05-1121-125/+111
* 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