aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'rails/master'Xavier Noria2010-06-2013-116/+79
|\ | | | | | | | | Conflicts: actionpack/lib/abstract_controller/base.rb
| * Fix problem with migrations template that can cause bogus code to be createdSteve Abatangle2010-06-201-4/+8
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * remove executable permission from files that don't need it. [#4802 ↵rohit2010-06-203-0/+0
| | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Refactor build_arel: move joins out and simplify havings. [#4860 state:resolved]Emilio Tagua2010-06-201-46/+46
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Don't overwrite unsaved updates when loading an association but preserve the ↵James Le Cuirot2010-06-201-1/+5
| | | | | | | | | | | | | | | | order of the loaded records. Reapplied from before but now allows already-saved records to be refreshed. [#4830 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Merge branch 'master' of github.com:rails/railsJosé Valim2010-06-202-2/+3
| |\
| | * Fix bug with rolling back frozen attributes.Brian Durand2010-06-182-2/+3
| | | | | | | | | | | | | | | | | | [#2991] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * | ActiveModel::Validations::Callbacks should not be required by default.José Valim2010-06-192-9/+2
| | |
| * | moving before_validation and after_validation functionality from ↵Neeraj Singh2010-06-193-22/+6
| | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord to ActiveModel [#4653 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * | Clear DescendantsTracker on each request.José Valim2010-06-191-1/+0
| | |
| * | ActiveRecord and ActionPack now use the new descendants implementation.José Valim2010-06-193-34/+7
| |/
| * setting the timezone in postgres to whatever ruby thinks the timezone is ↵Aaron Patterson2010-06-171-1/+6
| | | | | | | | | | | | [#4895 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | All scopes are now cross-referenced.Rizwan Reza2010-06-211-4/+4
| |
* | Missing quote and indentation wrongMalcolm Locke2010-06-171-2/+2
| |
* | Adds backslash to scope for cross-references.Rizwan Reza2010-06-161-1/+1
| |
* | Adds title to activerecord/lib/active_record/associations/*Rizwan Reza2010-06-1610-0/+12
| |
* | Adds title to the rest of the files in activerecord/libRizwan Reza2010-06-162-2/+7
| |
* | Adds title and proper formatting to docs.Rizwan Reza2010-06-164-6/+25
| |
* | Adds title where needed.Rizwan Reza2010-06-162-6/+11
| |
* | Adds basic description and title.Rizwan Reza2010-06-164-17/+38
| |
* | Adds title and minor changes.Rizwan Reza2010-06-165-17/+30
| |
* | Adds title.Rizwan Reza2010-06-152-36/+65
| |
* | Added typewriter tag to code.Rizwan Reza2010-06-151-2/+3
| |
* | Added description and title to Dynamic Scope MatchRizwan Reza2010-06-151-0/+7
| |
* | Adds title and basic description where needed.Rizwan Reza2010-06-157-0/+13
| |
* | Active Record Associations - minor change of DeleteRestrictionError doc for ↵Bryan Woods2010-06-151-1/+1
| | | | | | | | clarity
* | Fix a bunch of minor spelling mistakesEvgeniy Dolzhenko2010-06-158-20/+20
|\ \
| * | Fix a bunch of minor spelling mistakesEvgeniy Dolzhenko2010-06-118-20/+20
| | |
* | | Revert "removing the extra \"Neeraj Singh2010-06-151-1/+1
| | | | | | | | | | | | This reverts commit 51a9703b1e80caa30d699f30615f023079874623.
* | | Merge branch 'master' of github.com:lifo/docrailsNeeraj Singh2010-06-158-39/+42
|\ \ \ | | |/ | |/|
| * | Merge remote branch 'rails/master'Xavier Noria2010-06-141-18/+21
| |\ \
| | * | refactors AR::Base#reset_table_nameXavier Noria2010-06-141-19/+20
| | | |
| | * | Documentation for #quoted_table_name methodThiago Pradi2010-06-141-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com>
| * | | edit pass: the names of Rails components have a space, ie, "Active Record", ↵Xavier Noria2010-06-147-21/+21
| |/ / | | | | | | | | | not "ActiveRecord"
* / / removing the extra \Neeraj Singh2010-06-151-1/+1
|/ /
* | Remove an unused methodPratik Naik2010-06-121-13/+0
| |
* | Revert "Don't overwrite unsaved updates when loading an association but ↵José Valim2010-06-111-1/+1
|/ | | | | | | | preserve the order of the loaded records. [#4642 state:open]" This commit introduced a regression described in ticket [#4830]. This reverts commit 0265c708b9696c3943518ad5f3dabdc22c5eba11.
* class_attribute is not a direct replacement of class_inheritable_*.José Valim2010-06-101-2/+6
| | | | | | If you are setting a hash or an array in class_attribute or you need to freeze it, to ensure people won't modify it in place or you need to dup it on inheritance.
* Cut down even further on rake -T noiseDavid Heinemeier Hansson2010-06-091-13/+13
|
* Silence even more noisy rake task docsDavid Heinemeier Hansson2010-06-091-12/+12
|
* Don't overwrite unsaved updates when loading an association but preserve the ↵James Le Cuirot2010-06-091-1/+1
| | | | | | order of the loaded records. [#4642 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Make logic for after_commit and after_rollback :on option work like it does ↵Brian Durand2010-06-081-18/+33
| | | | | | | | for validation callbacks. [#2991 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Revert "Temporarily revert "Update after_commit and after_rollback docs and ↵Jeremy Kemper2010-06-082-9/+165
| | | | | | | | tests to use new style API with an :on options instead of on_* suffix." and "Add after_commit and after_rollback callbacks to ActiveRecord that are called after transactions either commit or rollback on all records saved or destroyed in the transaction."" This reverts commit 1b2941cba1165b0721f57524645fe378bee2a950. [#2991]
* Clarify Fixture#key_ and value_listJeremy Kemper2010-06-081-7/+5
|
* Merge remote branch 'docrails/master'Xavier Noria2010-06-081-1/+1
|\
| * Merge remote branch 'rails/master'Xavier Noria2010-06-086-171/+23
| |\
| * | update docs before_validation_on_create => before_validation(:on => :create)Santiago Pastorino and José Ignacio Costa2010-06-071-1/+1
| | |
* | | Fix ActiveRecord::Base.compute_type swallowing NoMethodError. [#4751 ↵Andrew Bloomgarden2010-06-081-1/+3
| |/ |/| | | | | | | | | state:resolved] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* | Temporarily revert "Update after_commit and after_rollback docs and tests to ↵Jeremy Kemper2010-06-082-165/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | use new style API with an :on options instead of on_* suffix." and "Add after_commit and after_rollback callbacks to ActiveRecord that are called after transactions either commit or rollback on all records saved or destroyed in the transaction." This reverts commits d2a49e4b1f30c5997e169110eed94a55aee53f56 and da840d13da865331297d5287391231b1ed39721b. [#2991] Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/transactions.rb activerecord/test/cases/transaction_callbacks_test.rb
* | Get ready for beta 4David Heinemeier Hansson2010-06-081-1/+1
| |