aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* AR::Integration must be included after AM::ConversionJohn Firebaugh2012-07-172-1/+7
* Merge pull request #4396 from kennyj/fix_4259Rafael Mendonça França2012-07-172-4/+40
* fixing tests to deal with data differences between prepared statements and no...Aaron Patterson2012-07-133-3/+8
* Fixing texts; down to three failing tests.Jeremy Cole2012-07-132-15/+24
* Only use prepared statements when bind variables are presentJeremy Cole2012-07-131-34/+40
* Update psql adapter to rename a default pkey sequence during rename_table.Robb Kidd2012-07-102-0/+27
* Merge pull request #6985 from sidonath/disable-query-cache-for-locksRafael Mendonça França2012-07-062-1/+17
* Backport #3329 to 3-2-stableFrancesco Rodriguez2012-07-022-15/+31
* Merge pull request #6878 from masarakki/masterRafael Mendonça França2012-06-285-0/+41
* Merge pull request #6900 from cbandy/issue-6898Carlos Antonio da Silva2012-06-281-0/+2
* Ensure Arel columns are typecasted properly when grouping with calculationCarlos Antonio da Silva2012-06-252-5/+9
* Merge pull request #6842 from ernie/handle-non-strings-in-grouped-calculationsRafael Mendonça França2012-06-242-6/+22
* Remove waning of unused variableRafael Mendonça França2012-06-211-1/+0
* Merge branch 'acapilleri-update_nested_attributes'Rafael Mendonça França2012-06-212-5/+25
* Merge pull request #6758 from caironoleto/masterJosé Valim2012-06-181-13/+13
* Deprecating composed_of in ActiveRecordSteve Klabnik2012-06-185-7/+24
* Remove unneded tests.Rafael Mendonça França2012-06-141-11/+1
* registers the deprecation of update_attribute in the CHANGELOGXavier Noria2012-06-141-0/+8
* Deprecate update_attribute.Steve Klabnik2012-06-147-17/+41
* Merge branch '3-2-stable-rel' into 3-2-stableAaron Patterson2012-06-124-5/+17
|\
| * updating changelogsAaron Patterson2012-06-121-1/+3
| * bumping version numbersAaron Patterson2012-06-111-1/+1
| * updating changelogs with security fixesAaron Patterson2012-06-111-0/+4
| * Additional fix for CVE-2012-2661Ernie Miller2012-06-112-3/+9
* | Merge pull request #6715 from arunagw/add_assertsRafael Mendonça França2012-06-121-2/+2
* | Merge pull request #6676 from aurelian/masterRafael Mendonça França2012-06-122-1/+5
|/
* Change the string to use in test case.kennyj2012-06-112-2/+2
* Fix GH #3163. Should quote database on mysql/mysql2.kennyj2012-06-113-1/+22
* Merge pull request #6698 from yahonda/address_ora_911_masterRafael Mendonça França2012-06-112-2/+2
* Merge pull request #6521 from Empact/throw-resultRafael Mendonça França2012-06-102-1/+8
* Remove warningRafael Mendonça França2012-06-101-1/+1
* Add test to column alias in `exists?` SQL.Rafael Mendonça França2012-06-101-0/+6
* Minimal change to query generation of exists? that makes SQLServer and others...iaddict2012-06-101-1/+1
* Merge pull request #6695 from kennyj/fix_6635Rafael Mendonça França2012-06-102-5/+14
* ActiveRecord#attributes optimization: minimize objects createdTieg Zaharia2012-06-091-1/+3
* Make test cover previous reversionJon Leighton2012-06-071-0/+1
* Revert "Perf: Don't load the association for #delete_all."Jon Leighton2012-06-076-45/+21
* Fix #6591. If a field with timezone isn't changed, we don't call will_change!.kennyj2012-06-041-1/+2
* Add failing test for 3.2.5 datetime attribute regressionEvan Arnold2012-06-041-0/+11
* Merge pull request #6593 from yahonda/skip_test_remove_column_with_array_as_a...Rafael Mendonça França2012-06-011-1/+3
|\
| * Skip test_remove_column_with_array_as_an_argument_is_deprecated with Oracle a...Yasuo Honda2012-06-021-1/+3
* | Add release date of 3.2.5 on the CHANGELOGRafael Mendonça França2012-06-011-0/+9
|/
* bumping to 3.2.5Aaron Patterson2012-05-311-1/+1
* Restore behavior of Active Record 3.2.3 scopesAndrew White2012-06-014-31/+4
* Merge branch '3-2-rel' into 3-2-stableAaron Patterson2012-05-312-2/+11
|\
| * bumping to 3.2.4Aaron Patterson2012-05-311-1/+1
| * adding security notifications to CHANGELOGsAaron Patterson2012-05-311-0/+3
| * Merge branch '3-2-stable-sec' into 3-2-relAaron Patterson2012-05-313-4/+38
| |\
| * | updating changelogsAaron Patterson2012-05-311-1/+7
| * | Merge pull request #6558 from parndt/fix_regressionAaron Patterson2012-05-301-3/+4