Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 1 | -2/+3 |
| | | | | | | 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 | 3 | -8/+13 |
| | |||||
* | Better shortcut options for custom validators [#5672 state:resolved] | Obie Fernandez | 2010-09-24 | 1 | -5/+10 |
| | | | | 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 | 2 | -16/+16 |
| | | | | | | | | | | | - 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 | 1 | -4/+22 |
| | |||||
* | Revert "Setup explicit requires for files with exceptions. Removed them from ↵ | José Valim | 2010-09-02 | 1 | -1/+0 |
| | | | | | | | | autoloading." Booting a new Rails application does not work after this commit [#5359 state:open] This reverts commit 38a421b34d0b414564e919f67d339fac067a56e6. | ||||
* | ActiveModel#to_xml fix (renamed parameter). | Andreas Garnæs | 2010-09-02 | 1 | -1/+1 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Setup explicit requires for files with exceptions. Removed them from ↵ | Łukasz Strzałkowski | 2010-09-02 | 1 | -0/+1 |
| | | | | | | autoloading. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Refactoring conditional logic | Subba Rao Pasupuleti | 2010-09-01 | 1 | -3/+3 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | reader method eliminates defined? checks | Subba Rao Pasupuleti | 2010-09-01 | 1 | -7/+9 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Remove deprecations in ActiveModel. | José Valim | 2010-08-29 | 4 | -63/+0 |
| | |||||
* | lifecycle should be two words, life cycle | Jaime Iniesta | 2010-08-26 | 1 | -1/+1 |
| | |||||
* | to_json => as_json | James Miller | 2010-08-25 | 2 | -11/+11 |
| | |||||
* | Master is now targeting 3.1.0.beta | David Heinemeier Hansson | 2010-08-23 | 1 | -2/+2 |
| | |||||
* | type fixed | Santiago Pastorino | 2010-08-22 | 1 | -1/+1 |
| | |||||
* | after_validation should be called irrespective of the result of validation. | Neeraj Singh | 2010-08-20 | 1 | -1/+1 |
| | | | | | | | | I confirmed that this is the behavior on 2.3.x . [5419 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Merge remote branch 'docrails/master' | Xavier Noria | 2010-08-18 | 1 | -2/+2 |
|\ | |||||
| * | you rarely want ^ or $ in validations, use \A when you mean \A | Xavier Noria | 2010-08-18 | 1 | -2/+2 |
| | | |||||
| * | Missing object for comparison in ActiveModel::EachValidator example code. | Trey Bean | 2010-08-17 | 1 | -1/+1 |
| | | |||||
| * | Deletes trailing whitespaces (over text files only find * -type f -exec sed ↵ | Santiago Pastorino | 2010-08-14 | 17 | -222/+222 |
| | | | | | | | | 's/[ \t]*$//' -i {} \;) | ||||
| * | no callbacks should be created for empty array [#5289 state:resolved] | Subba Rao Pasupuleti | 2010-08-14 | 1 | -3/+6 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | tidy up validations length code [#5297 state:resolved] | Subba Rao Pasupuleti | 2010-08-14 | 1 | -6/+2 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Add missing ActiveModel::Validations require | Greg Campbell | 2010-08-14 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | [#5311 state: resolved] ActiveModel::Validations uses Hash#except, but does not require it from ActiveSupport. (This wasn't showing up in the tests, because it was required in the helper, and was also required in ActiveModel::Serialization). Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | to_key should return all exists keys (if any exists), regardless if the ↵ | José Valim | 2010-08-15 | 2 | -3/+7 |
| | | | | | | | | object is persisted or not. If you need it to reflect persistance, you should use to_param. | ||||
* | | Deletes trailing whitespaces (over text files only find * -type f -exec sed ↵ | Santiago Pastorino | 2010-08-14 | 17 | -222/+222 |
| | | | | | | | | 's/[ \t]*$//' -i {} \;) | ||||
* | | no callbacks should be created for empty array [#5289 state:resolved] | Subba Rao Pasupuleti | 2010-08-12 | 1 | -3/+6 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | tidy up validations length code [#5297 state:resolved] | Subba Rao Pasupuleti | 2010-08-12 | 1 | -6/+2 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Add missing ActiveModel::Validations require | Greg Campbell | 2010-08-12 | 1 | -0/+1 |
|/ | | | | | | | | | | | [#5311 state: resolved] ActiveModel::Validations uses Hash#except, but does not require it from ActiveSupport. (This wasn't showing up in the tests, because it was required in the helper, and was also required in ActiveModel::Serialization). Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Merge remote branch 'docrails/master' | Xavier Noria | 2010-08-12 | 1 | -3/+3 |
|\ | |||||
| * | ActiveModel::Base doesn't exist, include_root_in_json is a class_attribute ↵ | Santiago Pastorino | 2010-08-10 | 1 | -3/+3 |
| | | | | | | | | for the classes which includes this module | ||||
* | | fixes a typo reported by rymai | Xavier Noria | 2010-08-10 | 1 | -1/+1 |
|/ | |||||
* | typo in AM | Adam Meehan | 2010-08-09 | 1 | -1/+1 |
| | |||||
* | edit pass to AMo::Serializers::JSON | Xavier Noria | 2010-08-06 | 1 | -9/+9 |
| | |||||
* | Merge remote branch 'docrails/master' | Xavier Noria | 2010-08-05 | 2 | -2/+4 |
|\ | |||||
| * | adding documentation to ActiveSupport::Concern ht:strictly typed for an ↵ | Neeraj Singh | 2010-08-04 | 1 | -0/+2 |
| | | | | | | | | | | | | awesome example some minor documentation changes | ||||
| * | fixing documentation | Neeraj Singh | 2010-08-03 | 1 | -2/+2 |
| | | |||||
* | | Tidy up error.rb code | Subba Rao Pasupuleti | 2010-08-03 | 1 | -5/+1 |
| | | | | | | | | | | | | [#5288 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> |