aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git@github.com:lifo/docrailsHongli Lai (Phusion)2008-09-04269-4583/+7625
|\
| * Merge commit 'mainstream/master'Pratik Naik2008-09-030-0/+0
| |\
| | * Merge docrailsPratik Naik2008-09-0323-199/+312
| * | Merge commit 'mainstream/master'Pratik Naik2008-09-03131-2200/+3101
| |\|
| | * Add each_with_object from 1.9 for a more convenient alternative to inject.Adam Keys2008-09-032-1/+26
| | * Inline help text was incorrectly telling user to uncomment line to use defaul...Nigel Ramsay2008-09-031-1/+1
| | * Whitespace.Clemens Kofler2008-09-031-5/+5
| | * Some performance goodness for inheritable attributes.Clemens Kofler2008-09-034-17/+17
| | * Some performance goodness for AR.Clemens Kofler2008-09-031-1/+1
| | * Some performance goodness for AM Validations.Clemens Kofler2008-09-031-2/+2
| | * Some performance goodness for AM StateMatchine.Clemens Kofler2008-09-031-3/+3
| | * Some performance goodness for routing.Clemens Kofler2008-09-031-3/+3
| | * Some performance goodness for AR associations.Clemens Kofler2008-09-031-32/+32
| | * More symbols for send and respond_to?.Clemens Kofler2008-09-035-9/+9
| | * More symbols for send and respond_to?.Clemens Kofler2008-09-031-1/+1
| | * Use symbols for send and respond_to?.Clemens Kofler2008-09-031-6/+6
| | * Removed unnecessary Symbol#to_proc from Asset Tag Helper.Clemens Kofler2008-09-031-1/+1
| | * Don't set Content-Length on 304 responsesJonathan del Strother2008-09-022-1/+7
| | * Database connections are now pooled, one pool per #establish_connection call.Jeremy Kemper2008-09-0285-708/+1175
| | |\
| | | * Merge rexml-expansion-fix gem into activesupport.Michael Koziarski2008-09-022-0/+56
| | | * translates when a message symbol has been set on builtin validationsIain Hecker2008-08-312-1/+35
| | | * Get rid of 'Object#send!'. It was originally added because it's in Ruby 1.9, ...Jeremy Kemper2008-08-3135-92/+86
| | | * Add layout functionality to mailers.Pratik Naik2008-08-319-3/+115
| | | * Fixes optimised named routes generating question mark followed by nothing whe...Luke Melia2008-08-312-2/+9
| | | * Moved layout exemption logic into the viewJoshua Peek2008-08-315-121/+63
| | | * Prefix ActionView::Base private methods with an underscoreJoshua Peek2008-08-315-12/+13
| | | * Fix AM tests and add tests for rendering loggingPratik Naik2008-08-313-2/+32
| | | * Add lost log messages about template renderingPratik Naik2008-08-312-1/+3
| | | * Move layout rendering logic to ActionView::BasePratik Naik2008-08-314-70/+57
| | | * Fix tests that assumed implicit order by idJeremy Kemper2008-08-301-2/+2
| | | * Move copying ivar logic from ActionController::Base to ActionView::BasePratik Naik2008-08-317-57/+35
| | | * Use reflection primary_key instead of id for when selecting association ids.miloops2008-08-301-1/+1
| | | * Allow prototype functions to receive position parameter as a symbol.miloops2008-08-302-1/+3
| | | * Remove unused use_full_path argumentPratik Naik2008-08-311-5/+5
| | | * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-08-303-2/+15
| | | |\
| | | | * Add test to make sure RJS block inside controller is executed in view contextPratik Naik2008-08-301-0/+13
| | | | * Dont pass controller partial layout option to viewPratik Naik2008-08-302-2/+2
| | | * | Performance: Better query for ASSOCIATION_ids. Select only ids if the associa...miloops2008-08-304-17/+73
| | | |/
| | | * Remove double layout checkPratik Naik2008-08-301-6/+1
| | | * Add support for shallow nesting of routes. [#838 state:resolved]Pratik Naik2008-08-303-37/+184
| | | * I18n: applied Luca Guidi's patch for better #interpolate performanceSven Fuchs2008-08-301-17/+20
| | | * Added optional rake doc:app TITLE environment parameterNathaniel Bibler2008-08-291-2/+2
| | | * Format related patches to support serializing data out in the correct format ...Rasik Pandey2008-08-299-50/+78
| | | * Make assert_select_rjs code more readable, make use of unused constants and u...miloops2008-08-292-52/+31
| | | * Added button_to_remote helperTarmo Tänav2008-08-293-0/+23
| | | * Fix test to not assume which thread finishes firstJeremy Kemper2008-08-291-1/+2
| | | * Move some core extension methods into a module under the ActiveSupport::CoreE...Hongli Lai (Phusion)2008-08-294-148/+165
| | | * Make NamedScope#size behave identically to AssociationCollection#size. [#933 ...Tom Stuart2008-08-292-1/+20
| | | * 1.9: methods need to be coerced into stringsJoshua Peek2008-08-291-1/+1
| | | * ActionMailer should respond_to? to methods handled by method_missing [#700 st...James Mead2008-08-292-5/+68