aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-183-18/+18
|\
| * Better doc styling in ActiveRecord::LockingSebastian Martinez2011-05-172-17/+17
| * Mailer example has more sense calling to deliver methodGuillermo Iguaran2011-05-151-1/+1
* | on.upcase!Akira Matsuda2011-05-191-1/+1
* | why not use JOIN statement for joining tables? (vol. 2)Akira Matsuda2011-05-181-21/+12
* | remove unused table from FROM clauseAkira Matsuda2011-05-181-2/+0
* | why not use JOIN statement for joining tables?Akira Matsuda2011-05-181-3/+3
* | Add missing requireSantiago Pastorino2011-05-171-0/+1
* | bumping arel requirementAaron Patterson2011-05-171-1/+1
* | Don't pass a block as we are yieldingAndrew White2011-05-171-1/+1
* | Add block setting of attributes to singular associationsAndrew White2011-05-175-11/+64
* | Pass the attribute and option hashes to build_associationAndrew White2011-05-175-8/+54
* | Fixed InnerJoinAssociationTest. Need to load essays fixture.Arun Agrawal2011-05-171-1/+1
* | Adding missing requireGuillermo Iguaran2011-05-161-0/+1
* | Merge pull request #560 from guilleiguaran/fix_pluralize_table_names_falseJon Leighton2011-05-164-1/+19
|\ \
| * | Fixing has_many association when ActiveRecord::Base.pluralize_table_names is ...Guillermo Iguaran2011-05-154-1/+19
* | | Add doc to #attribute_namesSebastian Martinez2011-05-151-0/+3
* | | Add ActiveRecord::attribute_names to retrieve a list of attribute names. This...Prem Sichanugrist2011-05-153-0/+23
| |/ |/|
* | These extra array operations appear to be unnecessary. Reasoning:Jon Leighton2011-05-141-8/+2
* | CollectionAssociation#merge_target_lists should write to the underlying attri...Jon Leighton2011-05-144-5/+17
* | An attempt to make CollectionAssociation#merge_target_lists make more sense.Jon Leighton2011-05-141-16/+35
|/
* Added some docs to controller runtime.José Valim2011-05-141-1/+4
* Reset ActiveRecord::LogSubscriber runtime at the start of each requestTom Ward2011-05-141-0/+5
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-141-1/+1
|\
| * :touch => :symbol also updates the updated_at attributeBruno Michel2011-05-101-1/+1
* | Instead of doing find(:all) which does scoped.find(:all) which does scoped.al...Jon Leighton2011-05-131-1/+1
* | Remove pointless rescue (it doesn't happen anywhere in the tests, and I can't...Jon Leighton2011-05-131-9/+1
* | backport skip to the AR base classAaron Patterson2011-05-131-0/+7
* | supporting infinity and -infinity for timestamps in PG. fixes #544Aaron Patterson2011-05-132-0/+39
* | Don't use mass-assignment protection when setting foreign keys or association...Jon Leighton2011-05-123-9/+45
* | updated AR#create! to accept an options hash so the mass-assignment security ...Josh Kalderimis2011-05-124-18/+44
* | Merge pull request #491 from arunagw/readme_changesSantiago Pastorino2011-05-111-1/+1
|\ \
| * | Some readme fixes as required. Arun Agrawal2011-05-101-1/+1
* | | 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
|\ \ \