Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2010-12-11 | 1 | -14/+14 |
|\ | | | | | | | | | Conflicts: activerecord/lib/active_record/transactions.rb | ||||
| * | Move ActiveModel::Lint::Tests documentation to be above module declaration ↵ | Ryan Bigg | 2010-12-09 | 1 | -14/+14 |
| | | | | | | | | so it appears in the API docs for this module. | ||||
* | | Take into account current time zone when serializing datetime values [#6096 ↵ | Mike Dvorkin | 2010-12-09 | 1 | -0/+1 |
|/ | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Test using default option as symbol added for human_attribute_name | Santiago Pastorino | 2010-12-05 | 1 | -0/+5 |
| | |||||
* | default could be a symbol here so attribute.to_s.humanize should be the ↵ | Santiago Pastorino | 2010-12-05 | 2 | -1/+6 |
| | | | | final option | ||||
* | If default is provided don't add attribute.to_s.humanize to the options | Santiago Pastorino | 2010-12-05 | 1 | -2/+1 |
| | |||||
* | Test falling back to default added for human_attribute_name | Santiago Pastorino | 2010-12-05 | 1 | -0/+4 |
| | |||||
* | Test using default option added for human_attribute_name | Santiago Pastorino | 2010-12-05 | 1 | -0/+4 |
| | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2010-12-05 | 1 | -2/+2 |
|\ | |||||
| * | grammar fix | Aditya Sanghi | 2010-11-27 | 1 | -2/+2 |
| | | |||||
* | | bump i18n gem | Sven Fuchs | 2010-12-04 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Don't compute this string again | Santiago Pastorino | 2010-12-02 | 1 | -1/+1 |
| | | |||||
* | | ActiveModel::Errors.to_hash returns plain OrderedHash and used in to_json ↵ | Thilo Utke | 2010-12-01 | 4 | -10/+22 |
| | | | | | | | | | | | | serialization to properly handle multiple errors per attribute [#5615 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Revert "Fix generation of wrong json string when field has multiple errors" | José Valim | 2010-12-01 | 2 | -20/+0 |
| | | | | | | | | This reverts commit a9b666b51d28b2e74da630c31327dee7cbe96d37. | ||||
* | | Fix generation of wrong json string when field has multiple errors | Krekoten' Marjan | 2010-12-01 | 2 | -0/+20 |
|/ | |||||
* | Rakefiles are executables, and rake loads rake, not rakefile code | raggi | 2010-11-25 | 1 | -0/+0 |
| | |||||
* | do not require ruby-debug automatically. please require it if you have ↵ | Aaron Patterson | 2010-11-19 | 1 | -6/+0 |
| | | | | declared it as a dependency | ||||
* | Bump builder to 3.0.0 | Santiago Pastorino | 2010-11-17 | 1 | -1/+1 |
| | |||||
* | Update the version.rb files to include a PRE part | Carl Lerche | 2010-11-16 | 1 | -2/+2 |
| | |||||
* | Fix when database column name has some symbolic characters. [#5818 ↵ | Robert Pankowecki | 2010-11-14 | 1 | -5/+5 |
| | | | | state:resolved] | ||||
* | syncs CHANGELOGs for 3.0.2 in 3-0-stable with the ones in master | Xavier Noria | 2010-11-09 | 1 | -0/+4 |
| | |||||
* | Allowing to_xml :camelize option to be set to :lower to enable ↵ | Jeremy Holland | 2010-11-03 | 1 | -0/+7 |
| | | | | lower-camelcase tags [#5903 state:resolved] | ||||
* | Added missing AS require to active_model/naming.rb | snusnu | 2010-10-30 | 1 | -0/+1 |
| | | | | | | | | | | | | | | We saw a failing spec when running the DataMapper ActiveModel compliance specs for dm-active_model. ActiveModel::Naming#model_name relies on the Module#parents method defined in active_support/core_ext/module/introspection.rb Adding the appropriate require statement of course fixed our specs. | ||||
* | Use latest I18n. | José Valim | 2010-10-26 | 1 | -1/+1 |
| | |||||
* | Merge CHANGELOGs from 3-0-stable | Santiago Pastorino | 2010-10-18 | 1 | -0/+3 |
| | |||||
* | Always pull in version for frameworks (standardize autoload / require / none) | wycats | 2010-10-10 | 1 | -2/+1 |
| | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2010-10-06 | 1 | -1/+1 |
|\ | |||||
| * | Fix syntax error in ActiveModel::Validations .validate example | fastred | 2010-10-01 | 1 | -1/+1 |
| | | |||||
* | | No need to pass self as parameter here. | José Valim | 2010-10-04 | 1 | -1/+1 |
| | | |||||
* | | Test to_model being called in ActiveModel::Naming helpers | Ernie Miller | 2010-10-04 | 2 | -0/+11 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Convert to model before calling model_name on a record in ActiveModel::Naming | Ernie Miller | 2010-10-04 | 1 | -1/+5 |
|/ | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | after_create in ActiveModel should in the order specified | Neeraj Singh | 2010-09-27 | 1 | -0/+30 |
| | | | | | | [#5650 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Merge remote branch 'miloops/warnings' | José Valim | 2010-09-27 | 1 | -1/+3 |
|\ | | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/url_for.rb | ||||
| * | Don't redefine existing attributes accessors. | Emilio Tagua | 2010-09-27 | 1 | -1/+3 |
| | | |||||
* | | Fix Namind#model_name. | thedarkone | 2010-09-27 | 1 | -2/+4 |
|/ | |||||
* | Don't act destructively on ActiveModel::Name#human options hash. [#5366 ↵ | John Firebaugh | 2010-09-25 | 3 | -2/+13 |
| | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Properly interpolate i18n keys in modules [#5572 state:resolved] | Rodrigo Rosenfeld Rosas | 2010-09-24 | 5 | -8/+37 |
| | |||||
* | Better shortcut options for custom validators [#5672 state:resolved] | Obie Fernandez | 2010-09-24 | 3 | -5/+32 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | resolves rdoc conflict | Xavier Noria | 2010-09-23 | 1 | -2/+2 |
|\ | |||||
| * | Tiny fixes to rdoc | Alexey Mahotkin | 2010-09-16 | 1 | -2/+2 |
| | | |||||
* | | Perf: refactor methods using inject when not need in activemodel. | Emilio Tagua | 2010-09-22 | 3 | -14/+6 |
| | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | | remove irrelevant comments | Neeraj Singh | 2010-09-18 | 1 | -2/+0 |
|/ | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Fixing documentation to reflect deprecated add_to_base | Mikel Lindsaar | 2010-09-12 | 1 | -2/+2 |
| | |||||
* | Fewer object allocations | Jeremy Kemper | 2010-09-09 | 1 | -8/+6 |
| | |||||
* | Cheaper attribute_method_matchers | Jeremy Kemper | 2010-09-09 | 1 | -9/+10 |
| | |||||
* | Fix require for class_attribute | Jeremy Kemper | 2010-09-09 | 1 | -1/+1 |
| | |||||
* | fixed some issues with JSON encoding | Jakub Suder | 2010-09-07 | 3 | -16/+43 |
| | | | | | | | | | | | - as_json in ActiveModel should return a hash and handle :only/:except/:methods options - Array and Hash should call as_json on their elements - json methods should not modify options argument [#5374 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Fix docs related to param_key in ActiveModel::Naming | Carlos Antonio da Silva | 2010-09-05 | 1 | -2/+2 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Add some documantation on new route_key and param_key in ActiveModel::Naming | Piotr Sarnacki | 2010-09-03 | 1 | -0/+16 |
| | |||||
* | Prepared ActiveModel::Naming to handle cases for namespaced isolated engines | Piotr Sarnacki | 2010-09-03 | 3 | -4/+134 |
| |