aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4856 from ihid/store_null_bugAaron Patterson2012-02-024-3/+16
|\
| * Allow store to be a not null column.Jeremy Walker2012-02-024-3/+16
* | *args is already an array. :'(Aaron Patterson2012-02-021-1/+1
* | columns method doesn't have name argumentRafael Mendonça França2012-02-022-6/+5
* | removed whitespace errors :yellow_heart::blue_heart::purple_heart::heart::gre...Aaron Patterson2012-02-021-4/+4
* | Remove useless argument in #columns.Sebastian Martinez2012-02-026-7/+7
* | Merge pull request #3892 from arunagw/verbose_rake_testJosé Valim2012-02-021-1/+0
|\ \
| * | No verbose the output for tests.Arun Agrawal2012-02-011-1/+0
* | | use the class method to (un)escape binary valuesAaron Patterson2012-02-011-2/+2
* | | Merge pull request #4543 from jdelStrother/find_or_initJon Leighton2012-02-012-2/+13
|\ \ \ | |_|/ |/| |
| * | Don't instantiate two objects in collection proxy / find_or_instantiator_byJonathan del Strother2012-01-192-2/+13
* | | Fix typoRafael Mendonça França2012-02-012-3/+3
* | | Use human attribute name to show the dependent destroy messageRafael Mendonça França2012-02-013-3/+28
* | | Merge pull request #4828 from railsaholic/fix_error_messageJosé Valim2012-02-014-4/+7
|\ \ \
| * | | fix has_one, has_many restrict error messageManoj2012-02-014-4/+7
* | | | Merge pull request #4806 from KL-7/do-not-serialize-nilAaron Patterson2012-02-012-2/+15
|\ \ \ \
| * | | | Do not serialize nil in serialized attribute.Kirill Lashuk2012-01-312-2/+15
* | | | | Merge pull request #4809 from cfeist/feist-sqlite-binary-corruptionAaron Patterson2012-02-013-17/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fixed issue with SQLite adapter corrupting binary dataChris Feist2012-01-311-16/+1
| * | | | Added test to illustrate bad binary blobs.Chris Feist2012-01-312-1/+2
* | | | | document the AR none method [ci skip]Vijay Dev2012-02-011-7/+7
* | | | | fix a typo [ci skip]Vijay Dev2012-02-011-1/+1
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-02-011-4/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Improve readonly examples and optimistic locking docsCarlos Antonio da Silva2012-01-311-4/+6
* | | | | Merge pull request #4799 from arunagw/warning_fixed_for_indentationsAaron Patterson2012-01-311-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | warning removed: mismatched indentationsArun Agrawal2012-01-311-1/+1
* | | | | 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 #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 #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
| | |/ / / | |/| | |
* | | | | 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 #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-319-35/+147
|\ \ \ \ \
| * | | | | 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-299-21/+168
| | |/ / / | |/| | |
* | | | | warning removed: shadowing outer local variable - klassArun Agrawal2012-01-311-2/+2
| |/ / / |/| | |