aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4783 from gregolsen/ids_reader_fixJon Leighton2012-01-313-1/+6
|\
| * ids_reader method fixed, test added to has_many associationgregolsen2012-01-313-1/+6
* | Merge pull request #4727 from railsaholic/dependent_restrict_should_add_errorJon Leighton2012-01-3111-35/+157
|\ \
| * | suggested fixes for :dependent => :restrict deprecation.Manoj2012-01-315-36/+16
| * | Same method for has_many and has_one associationsPaco Guzman2012-01-313-30/+17
| * | Easy dependent_restrict error messagePaco Guzman2012-01-312-4/+2
| * | has_many/has_one, :dependent => :restrict, deprecation added.Manoj2012-01-2911-21/+178
* | | Merge pull request #4788 from arunagw/warning_remove_shadowing_varSantiago Pastorino2012-01-311-2/+2
|\ \ \
| * | | warning removed: shadowing outer local variable - klassArun Agrawal2012-01-311-2/+2
|/ / /
* | | Merge pull request #4782 from lest/patch-1José Valim2012-01-311-1/+1
|\ \ \ | |_|/ |/| |
| * | fix assets testSergey Nartimov2012-01-311-1/+1
|/ /
* | Merge pull request #4763 from kennyj/fix_4754Jon Leighton2012-01-312-1/+17
|\ \
| * | Fix GH #4754. Remove double-quote when using ANSI_QUOTESkennyj2012-01-312-1/+17
* | | Merge pull request #4732 from pwim/refactor-dynamic-matchJon Leighton2012-01-303-28/+60
|\ \ \
| * | | Use conditional instead of tryPaul McMahon2012-01-311-1/+1
| * | | Decouple finding matching class from instantiationPaul McMahon2012-01-291-22/+29
| * | | Move argument validation into matchPaul McMahon2012-01-283-1/+13
| * | | Extract different DynamicFinderMatch subclassesPaul McMahon2012-01-281-26/+39
* | | | Merge pull request #4769 from sikachu/failing-testXavier Noria2012-01-301-1/+1
|\ \ \ \
| * | | | Fix failing test from [7619bcf2]Prem Sichanugrist2012-01-301-1/+1
* | | | | query cache instrumentation should included the bindings in the payload [clos...Xavier Noria2012-01-301-1/+1
|/ / / /
* | | | rewrites a couple of alternations in regexps as character classesXavier Noria2012-01-302-2/+2
* | | | Merge pull request #4767 from lest/patch-2José Valim2012-01-302-56/+26
|\ \ \ \
| * | | | merge MRI performance methods into one fileSergey Nartimov2012-01-302-56/+26
|/ / / /
* | | | Merge pull request #4765 from vijaydev/fix_4764Santiago Pastorino2012-01-301-1/+1
|\ \ \ \
| * | | | Fixes #4764 - remove generated new line in routes.rb on scaffold generationVijay Dev2012-01-311-1/+1
|/ / / /
* | | | Merge pull request #4753 from rahul100885/rahul100885_workSantiago Pastorino2012-01-301-14/+16
|\ \ \ \ | | |/ / | |/| |
| * | | Used block to make sure file get auto closed after useRahul P. Chaudhari2012-01-301-14/+16
|/ / /
* | | Merge pull request #4745 from lest/patch-1José Valim2012-01-291-6/+2
|\ \ \
| * | | remove ruby 1.8 support codeSergey Nartimov2012-01-291-6/+2
|/ / /
* | | Merge pull request #4744 from ndbroadbent/replace_for_loops_with_enumerablesSantiago Pastorino2012-01-2911-33/+33
|\ \ \
| * | | Use block form of 'File.open' so that File object is auto closed at endNathan Broadbent2012-01-302-14/+14
| * | | Replaced all 'for' loops with Enumerable#eachNathan Broadbent2012-01-3011-19/+19
* | | | Merge pull request #4743 from atd/patch-1José Valim2012-01-291-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Add 'image/pjpeg' format used by IE Antonio Tapiador2012-01-291-1/+1
|/ / /
* | | Merge pull request #4739 from nashby/refactor-date-helperSantiago Pastorino2012-01-292-15/+9
|\ \ \
| * | | tiny refactoringVasiliy Ermolovich2012-01-292-15/+9
| | |/ | |/|
* | | Merge pull request #4741 from pacoguzman/initialize_variable_not_neededSantiago Pastorino2012-01-291-2/+1
|\ \ \
| * | | Remove initialize variable columnn, not neededPaco Guzman2012-01-291-2/+1
|/ / /
* | | Merge pull request #4740 from castlerock/remove_autoload_UrlWriterJosé Valim2012-01-291-1/+0
|\ \ \ | |/ / |/| |
| * | remove autoload UrlWriter, no longer existsVishnu Atrai2012-01-291-1/+0
|/ /
* | Merge pull request #4731 from ndbroadbent/revert_build_original_fullpathSantiago Pastorino2012-01-271-1/+9
|\ \
| * | Reverted build_original_fullpath method, as per discussion at https://github....Nathan Broadbent2012-01-281-1/+9
|/ /
* | Merge pull request #4730 from carlosantoniodasilva/patch-1Santiago Pastorino2012-01-271-1/+0
|\ \ | |/ |/|
| * Remove not used env[] call in routing_test. Carlos Antonio da Silva2012-01-271-1/+0
|/
* Inline the prefix assignment so it doesnt look so daftDavid Heinemeier Hansson2012-01-271-2/+1
* Revert "Fix expanding cache key for single element arrays"David Heinemeier Hansson2012-01-272-16/+8
* Merge pull request #4726 from rafaelfranca/create_join_tableAaron Patterson2012-01-278-5/+194
|\
| * Add `create_join_table` migration helper to create HABTM join tablesRafael Mendonça França2012-01-278-5/+194
* | fix a small typo [ci skip]Vijay Dev2012-01-271-1/+1