| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #1097 from kirillrdy/master | Michael Koziarski | 2011-05-19 | 1 | -1/+1 |
| |\ | | | | | Improved "treat 0000-00-00 00:00:00 as nil Date" | ||||
| | * | Year 0 should fall to nil only if month and day are also 0 | Kirill Radzikhovskyy | 2011-05-17 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-18 | 2 | -17/+17 |
| |\ \ | |||||
| | * | | Better doc styling in ActiveRecord::Locking | Sebastian Martinez | 2011-05-17 | 2 | -17/+17 |
| | | | | |||||
| * | | | on.upcase! | Akira Matsuda | 2011-05-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | why not use JOIN statement for joining tables? (vol. 2) | Akira Matsuda | 2011-05-18 | 1 | -21/+12 |
| | | | | |||||
| * | | | remove unused table from FROM clause | Akira Matsuda | 2011-05-18 | 1 | -2/+0 |
| | | | | | | | | | | | | | pg_namespace has not been used since this commit 29b0707f07f148d98515125dab44b73cfdc0a3d4 | ||||
| * | | | why not use JOIN statement for joining tables? | Akira Matsuda | 2011-05-18 | 1 | -3/+3 |
| | | | | |||||
| * | | | Add missing require | Santiago Pastorino | 2011-05-17 | 1 | -0/+1 |
| | | | | |||||
| * | | | Don't pass a block as we are yielding | Andrew White | 2011-05-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add block setting of attributes to singular associations | Andrew White | 2011-05-17 | 2 | -11/+12 |
| | | | | |||||
| * | | | Pass the attribute and option hashes to build_association | Andrew White | 2011-05-17 | 2 | -8/+12 |
| | |/ |/| | | | | | | | | | | | The build_association method was added as an API for plugins to hook into in 1398db0. This commit restores this API and the ability to override class.new to return a subclass based on a virtual attribute in the attributes hash. | ||||
| * | | Merge pull request #560 from guilleiguaran/fix_pluralize_table_names_false | Jon Leighton | 2011-05-16 | 1 | -1/+1 |
| |\ \ | | | | | | | Fixing has_many when ActiveRecord::Base.pluralize_table_names is false | ||||
| | * | | Fixing has_many association when ActiveRecord::Base.pluralize_table_names is ↵ | Guillermo Iguaran | 2011-05-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | false. fixes #557 | ||||
| * | | | Add doc to #attribute_names | Sebastian Martinez | 2011-05-15 | 1 | -0/+3 |
| | | | | |||||
| * | | | Add ActiveRecord::attribute_names to retrieve a list of attribute names. ↵ | Prem Sichanugrist | 2011-05-15 | 1 | -0/+8 |
| | |/ |/| | | | | | This method will also return an empty array on an abstract class or a model that the table doesn't exists. | ||||
| * | | These extra array operations appear to be unnecessary. Reasoning: | Jon Leighton | 2011-05-14 | 1 | -8/+2 |
| | | | | | | | | | | | * It is not necessary to subtract 'id' from the list of copied attributes because record and mem_record are equal, so therefore their id attributes are also equal (so there is no harm in copying it, and this reduces the complexity of the code) * It is not necessary to intersect the attribute names, since record and mem_record are equal, so they have the same id and class, so they have the same columns in the database. If record has non-column attributes then it seems reasonable to also copy them onto mem_record (though I am not sure what situation this would ever happen in) | ||||
| * | | CollectionAssociation#merge_target_lists should write to the underlying ↵ | Jon Leighton | 2011-05-14 | 1 | -5/+2 |
| | | | | | | | | | attributes when copying, rather than using the assignment method | ||||
| * | | 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 |
| | | | | | Previously the runtime was reset implicitly when #cleanup_view_runtime was called at the end of most requests. However, this doesn't happen when the request redirects, or send_file is called. Consequently, the ActiveRecord runtime recorded in the logs included the time taken for both the current request and the previous redirect. Explicitly resetting at the start of each request ensures that this can't happen, no matter what occurs previously. | ||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-14 | 1 | -1/+1 |
| |\ | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/date_helper.rb railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt | ||||
| | * | :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 ↵ | Jon Leighton | 2011-05-13 | 1 | -1/+1 |
| | | | | | | | | | scoped.all, just do scoped.all. | ||||
| * | | Remove pointless rescue (it doesn't happen anywhere in the tests, and I ↵ | Jon Leighton | 2011-05-13 | 1 | -9/+1 |
| | | | | | | | | | can't see a way that it would happen ever) | ||||
| * | | 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 ↵ | Jon Leighton | 2011-05-12 | 1 | -9/+9 |
| | | | | | | | | | association conditions on singular associations. Fixes #481 (again). | ||||
| * | | updated AR#create! to accept an options hash so the mass-assignment security ↵ | Josh Kalderimis | 2011-05-12 | 2 | -5/+5 |
| | | | | | | | | | role can be passed in, also updated the Changelog to mention the change to some of the AR method signatures. | ||||
| * | | Merge pull request #512 from pivotalneutron/fix_eager_load_with_calculations | Jon Leighton | 2011-05-11 | 1 | -5/+4 |
| |\ \ | | | | | | | Bug fixes for calculations with includes | ||||
| | * | | Bug fixes: | Fadzril Muhamad & Joseph Palermo | 2011-05-12 | 1 | -5/+4 |
| | | | | | | | | | | | | | | | | | | | - If doing a count on a relation that has an :include and a :join, it does a distinct even though it should not. - When doing a count on a relation that has an :include, it always falls back to a old style left join when performing the count. Looks like it was broken here: https://github.com/rails/rails/commit/b9599502c9e738a5a1513e75d08f8d40ed408265 | ||||
| * | | | 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. ↵ | Jon Leighton | 2011-05-11 | 1 | -3/+4 |
| | | | | | | | | | Fixes #508. | ||||
| * | | 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 ↵ | Jon Leighton | 2011-05-10 | 2 | -3/+7 |
| | | | | | | | | | scoped.scope_for_create. Fixes #481. | ||||
| * | | 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 |
| | | | | | | | | | | | Wrapping each Record.associations.build in a transaction is going to make several unneeded queries. Reverting this commit also fixes #479. | ||||
| * | | 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 ↵ | Aaron Patterson | 2011-05-09 | 2 | -12/+9 |
| | | | | | | | | | normal SQL. fixes #411, #417 | ||||
| * | | 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 |
| | | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |