| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | An attempt to make CollectionAssociation#merge_target_lists make more sense. | Jon Leighton | 2011-05-14 | 1 | -16/+35 |
|/ |
|
* | Added some docs to controller runtime. | José Valim | 2011-05-14 | 1 | -1/+4 |
* | Reset ActiveRecord::LogSubscriber runtime at the start of each request | Tom Ward | 2011-05-14 | 1 | -0/+5 |
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-14 | 1 | -1/+1 |
|\ |
|
| * | :touch => :symbol also updates the updated_at attribute | Bruno Michel | 2011-05-10 | 1 | -1/+1 |
* | | Instead of doing find(:all) which does scoped.find(:all) which does scoped.al... | Jon Leighton | 2011-05-13 | 1 | -1/+1 |
* | | Remove pointless rescue (it doesn't happen anywhere in the tests, and I can't... | Jon Leighton | 2011-05-13 | 1 | -9/+1 |
* | | backport skip to the AR base class | Aaron Patterson | 2011-05-13 | 1 | -0/+7 |
* | | supporting infinity and -infinity for timestamps in PG. fixes #544 | Aaron Patterson | 2011-05-13 | 1 | -0/+13 |
* | | Don't use mass-assignment protection when setting foreign keys or association... | Jon Leighton | 2011-05-12 | 1 | -9/+9 |
* | | updated AR#create! to accept an options hash so the mass-assignment security ... | Josh Kalderimis | 2011-05-12 | 2 | -5/+5 |
* | | Merge pull request #512 from pivotalneutron/fix_eager_load_with_calculations | Jon Leighton | 2011-05-11 | 1 | -5/+4 |
|\ \ |
|
| * | | Bug fixes: | Fadzril Muhamad & Joseph Palermo | 2011-05-12 | 1 | -5/+4 |
* | | | Fix assigning protected attributes by attributes= | knapo | 2011-05-11 | 1 | -4/+3 |
* | | | Don't remove the target if it has already been destroyed | Andrew White | 2011-05-11 | 1 | -1/+1 |
* | | | Modified CollectionAssociation to refer to the new class name. | Michael Ebens | 2011-05-11 | 1 | -1/+1 |
|/ / |
|
* | | Don't use select() values from the join model of a through association. Fixes... | Jon Leighton | 2011-05-11 | 1 | -3/+4 |
* | | Bring back obj.association_loaded? as a deprecated method. Fixes #472. | Jon Leighton | 2011-05-11 | 1 | -0/+13 |
* | | fix bug in usage example of #unscoped | Corin Langosch | 2011-05-11 | 1 | -1/+1 |
* | | 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 | 2 | -3/+7 |
* | | deprecating CSV fixture support | Aaron Patterson | 2011-05-10 | 1 | -54/+2 |
* | | deprecating read_csv_fixture_files method | Aaron Patterson | 2011-05-10 | 1 | -0/+2 |
* | | Puts ActiveRecord::SessionStore attributes in white list, fixes #483 | slainer68 | 2011-05-10 | 1 | -0/+2 |
* | | 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 |
* | | Ensure assign_attributes and update_attributes do not fail on nil, closes #478. | José Valim | 2011-05-10 | 1 | -0/+2 |
* | | use a null byte as a bind parameter substitute as it is not allowed in normal... | Aaron Patterson | 2011-05-09 | 2 | -12/+9 |
* | | 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 | 1 | -1/+6 |
|\ \ |
|
| * | | Fix for #371 | Nick Howard | 2011-05-08 | 1 | -1/+6 |
* | | | Ensure that ORDER BY clauses from default scopes are not included in calculat... | Jon Leighton | 2011-05-08 | 1 | -1/+1 |
* | | | Don't quote ID's as Arel will quote them -- follow same conventions as the de... | Christopher Meiklejohn | 2011-05-08 | 1 | -1/+1 |
* | | | renamed mass-assignment scopes to roles, updated code, tests, docs and securi... | Josh Kalderimis | 2011-05-08 | 2 | -7/+7 |
|/ / |
|
* | | 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 | 2 | -288/+290 |
* | | 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 | 2 | -5/+9 |
* | | fix yield not working from around filter of observers, fixes Github#329 | Hemant Kumar | 2011-05-07 | 1 | -2/+2 |
* | | Merge pull request #396 from asanghi/lh_4346 | Xavier Noria | 2011-05-06 | 1 | -29/+52 |
|\ \ |
|
| * | | Multiparameter POLA, time_select fixes. See LH4346 | Aditya Sanghi | 2011-05-05 | 1 | -29/+52 |
* | | | Merge pull request #399 from ernie/join_conditions_on_join | Jon Leighton | 2011-05-05 | 1 | -3/+3 |
|\ \ \ |
|
| * | | | Add join conditions to JOIN clause, not WHERE | Ernie Miller | 2011-05-05 | 1 | -3/+3 |
| |/ / |
|
* | | | Merge pull request #358 from baroquebobcat/fix_find_or_create_master | Aaron Patterson | 2011-05-05 | 1 | -3/+6 |
|\ \ \
| |/ /
|/| | |
|
| * | | Fix for lighthouse #6741 | Nick Howard | 2011-05-01 | 1 | -3/+6 |
* | | | Prepare for beta1 | David Heinemeier Hansson | 2011-05-04 | 1 | -1/+1 |