aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Added as_json method for multibyte stringsDmitriy Vorotilin2012-02-012-0/+7
* Revert "Merge pull request #4746 from jenslukowski/issue4718"Aaron Patterson2012-01-312-16/+1
* Merge pull request #4805 from xuanxu/none_and_null_object_patternJon Leighton2012-01-316-1/+71
|\
| * Added `none` query method to return zero records.Juanjo Bazán2012-01-316-1/+71
* | QueryCache will just dup an AR::Result, AR::Result can deep copyAaron Patterson2012-01-312-9/+21
* | always return the result set from select_allAaron Patterson2012-01-312-2/+2
* | made the result set object act more like an arrayAaron Patterson2012-01-315-4/+24
* | Merge pull request #4735 from arton/masterAaron Patterson2012-01-311-1/+5
|\ \
| * | run direcly $0 if rake invoked by Windows batch file.arton2012-01-291-1/+5
* | | Merge pull request #4742 from petervandenabeele/masterAaron Patterson2012-01-311-0/+3
|\ \ \
| * | | Set default_timezone explicitly for a test in activerecord/../base_test.rbPeter Vandenabeele2012-01-291-0/+3
* | | | Merge pull request #4746 from jenslukowski/issue4718Aaron Patterson2012-01-312-1/+16
|\ \ \ \ | |_|_|/ |/| | |
| * | | fix for Issue 4718Jens Lukowski2012-01-291-1/+8
| * | | failing test case for Issue 4718Jens Lukowski2012-01-281-0/+8
| | |/ | |/|
* | | Merge pull request #4803 from lucascaton/masterAaron Patterson2012-01-313-3/+5
|\ \ \
| * | | Remove slash from favicon_link_tag method attributeLucas Caton2012-01-313-3/+5
|/ / /
* | | Merge pull request #4802 from carlosantoniodasilva/collection-helpers-refactorJosé Valim2012-01-313-14/+28
|\ \ \
| * | | Remove eval calls, use send.. eval is evilCarlos Antonio da Silva2012-01-311-3/+3
| * | | Refactor select tag form helpersCarlos Antonio da Silva2012-01-312-11/+25
* | | | Merge pull request #4791 from gregolsen/reflection_test_fixedJosé Valim2012-01-313-4/+4
|\ \ \ \
| * | | | test_get_ids_for_ordered_association fixedgregolsen2012-01-312-2/+2
| * | | | reflection test fixedgregolsen2012-01-311-2/+2
* | | | | Merge pull request #4800 from rafaelfranca/remove-warningsJosé Valim2012-01-314-16/+31
|\ \ \ \ \
| * | | | | Remove deprecation warnings from testsRafael Mendonça França2012-01-313-13/+28
| * | | | | Put spaces between the words at deprecation warningRafael Mendonça França2012-01-311-3/+3
| | |/ / / | |/| | |
* | | | | Merge pull request #4797 from kennyj/fix_4774José Valim2012-01-312-1/+6
|\ \ \ \ \
| * | | | | Don't run bundle install when passed with --pretend optionkennyj2012-02-012-1/+6
| |/ / / /
* | | | | Merge pull request #4798 from ihower/fix_routing_typoJosé Valim2012-01-311-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix typo in routing documentationWen-Tien Chang2012-02-011-1/+1
|/ / / /
* | | | Merge pull request #4792 from rafaelfranca/build-fixJosé Valim2012-01-312-1/+2
|\ \ \ \
| * | | | Only add ActiveRecord configuration if it is presentRafael Mendonça França2012-01-312-1/+2
| |/ / /
* | | | to_proper_path -> to_partial_pathJosé Valim2012-01-311-1/+1
* | | | Update actionpack/lib/action_view/renderer/partial_renderer.rbJosé Valim2012-01-311-2/+1
|/ / /
* | | 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