Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make ActiveModel::Errors#add_on_blank and #add_on_empty accept an options ↵ | Jeroen van Dijk | 2010-06-21 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | hash and make various Validators pass their (filtered) options. This makes it possible to pass additional options through Validators to message generation. E.g. plugin authors want to add validates_presence_of :foo, :format => "some format". Also, cleanup the :default vs :message options confusion in ActiveModel validation message generation. Also, deprecate ActiveModel::Errors#add_on_blank(attributes, custom_message) in favor of ActiveModel::Errors#add_on_blank(attributes, options). Also, refactoring of ActiveModel and ActiveRecord Validation tests. Test are a lot more DRY now. Better test coverage as well now. The first four points were reapplied from an older patch of Sven Fuchs which didn't apply cleanly anymore and was not complete yet. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Don't waste time building relations if there are no values presents. [#4860 ↵ | Emilio Tagua | 2010-06-21 | 1 | -4/+4 |
| | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Merge remote branch 'rails/master' | Xavier Noria | 2010-06-20 | 12 | -112/+71 |
|\ | | | | | | | | | Conflicts: actionpack/lib/abstract_controller/base.rb | ||||
| * | remove executable permission from files that don't need it. [#4802 ↵ | rohit | 2010-06-20 | 3 | -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 Tagua | 2010-06-20 | 1 | -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 Cuirot | 2010-06-20 | 1 | -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/rails | José Valim | 2010-06-20 | 2 | -2/+3 |
| |\ | |||||
| | * | Fix bug with rolling back frozen attributes. | Brian Durand | 2010-06-18 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | | | [#2991] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | | ActiveModel::Validations::Callbacks should not be required by default. | José Valim | 2010-06-19 | 2 | -9/+2 |
| | | | |||||
| * | | moving before_validation and after_validation functionality from ↵ | Neeraj Singh | 2010-06-19 | 3 | -22/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord to ActiveModel [#4653 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | | Clear DescendantsTracker on each request. | José Valim | 2010-06-19 | 1 | -1/+0 |
| | | | |||||
| * | | ActiveRecord and ActionPack now use the new descendants implementation. | José Valim | 2010-06-19 | 3 | -34/+7 |
| |/ | |||||
| * | setting the timezone in postgres to whatever ruby thinks the timezone is ↵ | Aaron Patterson | 2010-06-17 | 1 | -1/+6 |
| | | | | | | | | | | | | [#4895 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | All scopes are now cross-referenced. | Rizwan Reza | 2010-06-21 | 1 | -4/+4 |
| | | |||||
* | | Missing quote and indentation wrong | Malcolm Locke | 2010-06-17 | 1 | -2/+2 |
| | | |||||
* | | Adds backslash to scope for cross-references. | Rizwan Reza | 2010-06-16 | 1 | -1/+1 |
| | | |||||
* | | Adds title to activerecord/lib/active_record/associations/* | Rizwan Reza | 2010-06-16 | 10 | -0/+12 |
| | | |||||
* | | Adds title to the rest of the files in activerecord/lib | Rizwan Reza | 2010-06-16 | 2 | -2/+7 |
| | | |||||
* | | Adds title and proper formatting to docs. | Rizwan Reza | 2010-06-16 | 4 | -6/+25 |
| | | |||||
* | | Adds title where needed. | Rizwan Reza | 2010-06-16 | 2 | -6/+11 |
| | | |||||
* | | Adds basic description and title. | Rizwan Reza | 2010-06-16 | 4 | -17/+38 |
| | | |||||
* | | Adds title and minor changes. | Rizwan Reza | 2010-06-16 | 5 | -17/+30 |
| | | |||||
* | | Adds title. | Rizwan Reza | 2010-06-15 | 2 | -36/+65 |
| | | |||||
* | | Added typewriter tag to code. | Rizwan Reza | 2010-06-15 | 1 | -2/+3 |
| | | |||||
* | | Added description and title to Dynamic Scope Match | Rizwan Reza | 2010-06-15 | 1 | -0/+7 |
| | | |||||
* | | Adds title and basic description where needed. | Rizwan Reza | 2010-06-15 | 7 | -0/+13 |
| | | |||||
* | | Active Record Associations - minor change of DeleteRestrictionError doc for ↵ | Bryan Woods | 2010-06-15 | 1 | -1/+1 |
| | | | | | | | | clarity | ||||
* | | Fix a bunch of minor spelling mistakes | Evgeniy Dolzhenko | 2010-06-15 | 8 | -20/+20 |
|\ \ | |||||
| * | | Fix a bunch of minor spelling mistakes | Evgeniy Dolzhenko | 2010-06-11 | 8 | -20/+20 |
| | | | |||||
* | | | Revert "removing the extra \" | Neeraj Singh | 2010-06-15 | 1 | -1/+1 |
| | | | | | | | | | | | | This reverts commit 51a9703b1e80caa30d699f30615f023079874623. | ||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Neeraj Singh | 2010-06-15 | 8 | -39/+42 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge remote branch 'rails/master' | Xavier Noria | 2010-06-14 | 1 | -18/+21 |
| |\ \ | |||||
| | * | | refactors AR::Base#reset_table_name | Xavier Noria | 2010-06-14 | 1 | -19/+20 |
| | | | | |||||
| | * | | Documentation for #quoted_table_name method | Thiago Pradi | 2010-06-14 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
| * | | | edit pass: the names of Rails components have a space, ie, "Active Record", ↵ | Xavier Noria | 2010-06-14 | 7 | -21/+21 |
| |/ / | | | | | | | | | | not "ActiveRecord" | ||||
* / / | removing the extra \ | Neeraj Singh | 2010-06-15 | 1 | -1/+1 |
|/ / | |||||
* | | Remove an unused method | Pratik Naik | 2010-06-12 | 1 | -13/+0 |
| | | |||||
* | | Revert "Don't overwrite unsaved updates when loading an association but ↵ | José Valim | 2010-06-11 | 1 | -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é Valim | 2010-06-10 | 1 | -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 noise | David Heinemeier Hansson | 2010-06-09 | 1 | -13/+13 |
| | |||||
* | Silence even more noisy rake task docs | David Heinemeier Hansson | 2010-06-09 | 1 | -12/+12 |
| | |||||
* | Don't overwrite unsaved updates when loading an association but preserve the ↵ | James Le Cuirot | 2010-06-09 | 1 | -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 Durand | 2010-06-08 | 1 | -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 Kemper | 2010-06-08 | 2 | -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_list | Jeremy Kemper | 2010-06-08 | 1 | -7/+5 |
| | |||||
* | Merge remote branch 'docrails/master' | Xavier Noria | 2010-06-08 | 1 | -1/+1 |
|\ | |||||
| * | Merge remote branch 'rails/master' | Xavier Noria | 2010-06-08 | 6 | -171/+23 |
| |\ | |||||
| * | | update docs before_validation_on_create => before_validation(:on => :create) | Santiago Pastorino and José Ignacio Costa | 2010-06-07 | 1 | -1/+1 |
| | | | |||||
* | | | Fix ActiveRecord::Base.compute_type swallowing NoMethodError. [#4751 ↵ | Andrew Bloomgarden | 2010-06-08 | 1 | -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 Kemper | 2010-06-08 | 2 | -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 |