| Commit message (Expand) | Author | Age | Files | Lines |
* | Bring back obj.association_loaded? as a deprecated method. Fixes #472. | Jon Leighton | 2011-05-11 | 2 | -0/+22 |
* | fix bug in usage example of #unscoped | Corin Langosch | 2011-05-11 | 1 | -1/+1 |
* | Add test to specify that attributes from an association's conditions should b... | Jon Leighton | 2011-05-10 | 4 | -4/+28 |
* | Remove unnecessary '|| {}' | Jon Leighton | 2011-05-10 | 1 | -1/+1 |
* | Don't use mass-assignment protection when applying the scoped.scope_for_creat... | Jon Leighton | 2011-05-10 | 3 | -3/+16 |
* | minor cleaning with new api method | Vishnu Atrai | 2011-05-11 | 1 | -11/+11 |
* | deprecating CSV fixture support | Aaron Patterson | 2011-05-10 | 4 | -55/+7 |
* | deprecating read_csv_fixture_files method | Aaron Patterson | 2011-05-10 | 1 | -0/+2 |
* | Merge pull request #495 from vatrai/minor_fixes | Piotr Sarnacki | 2011-05-10 | 2 | -2/+2 |
|\ |
|
| * | minor cleaning | Vishnu Atrai | 2011-05-10 | 2 | -2/+2 |
* | | Merge pull request #493 from guilleiguaran/changelog-fixes | Aaron Patterson | 2011-05-10 | 1 | -0/+80 |
|\ \ |
|
| * | | Merging 3.0.x CHANGELOGs | Guillermo Iguaran | 2011-05-10 | 1 | -0/+80 |
* | | | Methods that return nil should not be considered YAML | Joshua Wehner | 2011-05-10 | 1 | -4/+1 |
| |/
|/| |
|
* | | Puts ActiveRecord::SessionStore attributes in white list, fixes #483 | slainer68 | 2011-05-10 | 2 | -0/+8 |
* | | Fix typos in IM documentation | Vijay Dev | 2011-05-10 | 1 | -2/+2 |
* | | Document identity map inconsistency with associations, closes #474. | José Valim | 2011-05-10 | 1 | -1/+28 |
* | | Fix #480. Passing nil to create association works. | José Valim | 2011-05-10 | 1 | -1/+1 |
* | | Revert "b9ea751d0e56bd00d341766977a607ed3f7ddd0f". | José Valim | 2011-05-10 | 1 | -26/+27 |
* | | Add failing tests according to #479. | José Valim | 2011-05-10 | 1 | -0/+15 |
* | | Add failing tests, according to #480. | José Valim | 2011-05-10 | 1 | -0/+14 |
* | | Ensure assign_attributes and update_attributes do not fail on nil, closes #478. | José Valim | 2011-05-10 | 3 | -0/+10 |
|/ |
|
* | use a null byte as a bind parameter substitute as it is not allowed in normal... | Aaron Patterson | 2011-05-09 | 3 | -12/+59 |
* | removed an unneed AS::Concern from AR::IdentityMap | Josh Kalderimis | 2011-05-09 | 1 | -2/+1 |
* | Interleave db_list and file_list. | Christopher Wade | 2011-05-09 | 1 | -6/+6 |
* | Sort migrations by the migration ID. | Christopher Wade | 2011-05-09 | 1 | -2/+2 |
* | Merge pull request #451 from baroquebobcat/fixing_last_for_issue_371 | Jon Leighton | 2011-05-08 | 2 | -1/+27 |
|\ |
|
| * | Fix for #371 | Nick Howard | 2011-05-08 | 2 | -1/+27 |
* | | Ensure that ORDER BY clauses from default scopes are not included in calculat... | Jon Leighton | 2011-05-08 | 2 | -1/+5 |
* | | Don't quote ID's as Arel will quote them -- follow same conventions as the de... | Christopher Meiklejohn | 2011-05-08 | 5 | -2/+52 |
* | | renamed mass-assignment scopes to roles, updated code, tests, docs and securi... | Josh Kalderimis | 2011-05-08 | 3 | -34/+34 |
|/ |
|
* | Added deprecation warning for Fixture(s) (Use ActiveRecord::Fixture(s)) | Jason Noble | 2011-05-07 | 1 | -0/+3 |
* | Namespace Fixtures in ActiveRecord | Jason Noble | 2011-05-07 | 8 | -318/+320 |
* | Class.new.name returns an empty string on 1.8 | José Valim | 2011-05-07 | 1 | -1/+1 |
* | Revert "Revert the merge because tests did not pass." | José Valim | 2011-05-07 | 3 | -5/+44 |
* | fix yield not working from around filter of observers, fixes Github#329 | Hemant Kumar | 2011-05-07 | 2 | -2/+27 |
* | Merge pull request #396 from asanghi/lh_4346 | Xavier Noria | 2011-05-06 | 2 | -29/+187 |
|\ |
|
| * | Multiparameter POLA, time_select fixes. See LH4346 | Aditya Sanghi | 2011-05-05 | 2 | -29/+187 |
* | | Update CHANGELOGs. | José Valim | 2011-05-06 | 1 | -19/+16 |
* | | Merge pull request #399 from ernie/join_conditions_on_join | Jon Leighton | 2011-05-05 | 2 | -3/+14 |
|\ \ |
|
| * | | Add a test for outer joins with conditions where value IS NULL | Ernie Miller | 2011-05-05 | 1 | -0/+5 |
| * | | Add join conditions to JOIN clause, not WHERE | Ernie Miller | 2011-05-05 | 2 | -3/+9 |
| |/ |
|
* | | Merge pull request #358 from baroquebobcat/fix_find_or_create_master | Aaron Patterson | 2011-05-05 | 2 | -3/+30 |
|\ \
| |/
|/| |
|
| * | Fix for lighthouse #6741 | Nick Howard | 2011-05-01 | 2 | -3/+30 |
* | | Prepare for beta1 | David Heinemeier Hansson | 2011-05-04 | 1 | -1/+1 |
* | | ensure query cache is cleared when Rack body is closed, fixes bug reported on... | Aaron Patterson | 2011-05-04 | 2 | -0/+12 |
* | | Bump up rack-cache, tzinfo and thor | Santiago Pastorino | 2011-05-04 | 1 | -1/+1 |
* | | Move sandbox to AR and pass the sandbox as a value. This way, other ORMs like... | José Valim | 2011-05-04 | 2 | -1/+8 |
* | | Remove defined?(ActiveRecord) and use the railtie hook instead. | José Valim | 2011-05-04 | 1 | -3/+4 |
* | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-04 | 5 | -33/+41 |
|\ \ |
|
| * | | Remove extra whitespaces | Sebastian Martinez | 2011-05-03 | 1 | -9/+9 |