| Commit message (Collapse) | 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 | |
| | | | | | 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 | |
| | | | ||||||
| * | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if a query contains a limit or an offset, ActiveRecord::FinderMethods#find_last had inconsistent behavior. If the records were loaded, it returned the last record in the cached list. If they were not, it reversed the order of the query and changed the limit to one. If the earlier limit was less than the total matching the query in the db, it would return a different record than if the records had been cached. This commit changes find_last so that it loads the records when getting the last record on a query containing a limit or an offset, which makes the behavior consistent. | |||||
| * | | | Ensure that ORDER BY clauses from default scopes are not included in ↵ | Jon Leighton | 2011-05-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | calculation queries. Fixes #406. | |||||
| * | | | Don't quote ID's as Arel will quote them -- follow same conventions as the ↵ | Christopher Meiklejohn | 2011-05-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | delete method. | |||||
| * | | | renamed mass-assignment scopes to roles, updated code, tests, docs and ↵ | Josh Kalderimis | 2011-05-08 | 2 | -7/+7 | |
| |/ / | | | | | | | security guide | |||||
| * | | 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 | |
| | | | | | | | [Fixes #439] | |||||
| * | | 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 | |
| | | | | | | | | | This reverts commit 886818d2bab40585c0cea763002ffc16917dd0b3. | |||||
| * | | 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 (principle of least authority) with respect to time_select fixes. See LH4346 | |||||
| | * | | 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 association join conditions to JOIN clause, not WHERE | |||||
| | * | | | 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 | |||||
| | * | | Fix for lighthouse #6741 | Nick Howard | 2011-05-01 | 1 | -3/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | - adds tests for find_or_create_by and find_or_initialize_by on has_many associations - changes the behavior of ActiveRecord::Associations::CollectionProxy#method_missing to differ to ActiveRecord::FinderMethods#find_or_instantiator_by_attributes for arg processing and saving so find_or_create_by's api on associations will be consistent w/ the api for model classes. | |||||
| * | | | Prepare for beta1 | David Heinemeier Hansson | 2011-05-04 | 1 | -1/+1 | |
| | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |