aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #512 from pivotalneutron/fix_eager_load_with_calculationsJon Leighton2011-05-113-6/+18
|\
| * Bug fixes:Fadzril Muhamad & Joseph Palermo2011-05-123-6/+18
* | Add missing requiresSantiago Pastorino2011-05-111-0/+1
* | Fix assigning protected attributes by attributes=knapo2011-05-112-6/+10
* | Don't remove the target if it has already been destroyedAndrew White2011-05-112-1/+10
* | Modified NamedScopeTest to use CollectionAssociation.Michael Ebens2011-05-111-1/+1
* | Modified CollectionAssociation to refer to the new class name.Michael Ebens2011-05-111-1/+1
|/
* Don't use select() values from the join model of a through association. Fixes...Jon Leighton2011-05-115-3/+23
* Bring back obj.association_loaded? as a deprecated method. Fixes #472.Jon Leighton2011-05-112-0/+22
* fix bug in usage example of #unscopedCorin Langosch2011-05-111-1/+1
* Add test to specify that attributes from an association's conditions should b...Jon Leighton2011-05-104-4/+28
* Remove unnecessary '|| {}'Jon Leighton2011-05-101-1/+1
* Don't use mass-assignment protection when applying the scoped.scope_for_creat...Jon Leighton2011-05-103-3/+16
* minor cleaning with new api methodVishnu Atrai2011-05-111-11/+11
* deprecating CSV fixture supportAaron Patterson2011-05-104-55/+7
* deprecating read_csv_fixture_files methodAaron Patterson2011-05-101-0/+2
* Merge pull request #495 from vatrai/minor_fixesPiotr Sarnacki2011-05-102-2/+2
|\
| * minor cleaningVishnu Atrai2011-05-102-2/+2
* | Merge pull request #493 from guilleiguaran/changelog-fixesAaron Patterson2011-05-101-0/+80
|\ \
| * | Merging 3.0.x CHANGELOGsGuillermo Iguaran2011-05-101-0/+80
* | | Methods that return nil should not be considered YAMLJoshua Wehner2011-05-101-4/+1
| |/ |/|
* | Puts ActiveRecord::SessionStore attributes in white list, fixes #483slainer682011-05-102-0/+8
* | Fix typos in IM documentationVijay Dev2011-05-101-2/+2
* | Document identity map inconsistency with associations, closes #474.José Valim2011-05-101-1/+28
* | Fix #480. Passing nil to create association works.José Valim2011-05-101-1/+1
* | Revert "b9ea751d0e56bd00d341766977a607ed3f7ddd0f".José Valim2011-05-101-26/+27
* | Add failing tests according to #479.José Valim2011-05-101-0/+15
* | Add failing tests, according to #480.José Valim2011-05-101-0/+14
* | Ensure assign_attributes and update_attributes do not fail on nil, closes #478.José Valim2011-05-103-0/+10
|/
* use a null byte as a bind parameter substitute as it is not allowed in normal...Aaron Patterson2011-05-093-12/+59
* removed an unneed AS::Concern from AR::IdentityMapJosh Kalderimis2011-05-091-2/+1
* Interleave db_list and file_list.Christopher Wade2011-05-091-6/+6
* Sort migrations by the migration ID.Christopher Wade2011-05-091-2/+2
* Merge pull request #451 from baroquebobcat/fixing_last_for_issue_371Jon Leighton2011-05-082-1/+27
|\
| * Fix for #371Nick Howard2011-05-082-1/+27
* | Ensure that ORDER BY clauses from default scopes are not included in calculat...Jon Leighton2011-05-082-1/+5
* | Don't quote ID's as Arel will quote them -- follow same conventions as the de...Christopher Meiklejohn2011-05-085-2/+52
* | renamed mass-assignment scopes to roles, updated code, tests, docs and securi...Josh Kalderimis2011-05-083-34/+34
|/
* Added deprecation warning for Fixture(s) (Use ActiveRecord::Fixture(s))Jason Noble2011-05-071-0/+3
* Namespace Fixtures in ActiveRecordJason Noble2011-05-078-318/+320
* Class.new.name returns an empty string on 1.8José Valim2011-05-071-1/+1
* Revert "Revert the merge because tests did not pass."José Valim2011-05-073-5/+44
* fix yield not working from around filter of observers, fixes Github#329Hemant Kumar2011-05-072-2/+27
* Merge pull request #396 from asanghi/lh_4346Xavier Noria2011-05-062-29/+187
|\
| * Multiparameter POLA, time_select fixes. See LH4346Aditya Sanghi2011-05-052-29/+187
* | Update CHANGELOGs.José Valim2011-05-061-19/+16
* | Merge pull request #399 from ernie/join_conditions_on_joinJon Leighton2011-05-052-3/+14
|\ \
| * | Add a test for outer joins with conditions where value IS NULLErnie Miller2011-05-051-0/+5
| * | Add join conditions to JOIN clause, not WHEREErnie Miller2011-05-052-3/+9
| |/
* | Merge pull request #358 from baroquebobcat/fix_find_or_create_masterAaron Patterson2011-05-052-3/+30
|\ \ | |/ |/|