aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3-2-sec' into 3-2-secmergeAaron Patterson2013-01-081-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-sec: bumping version CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealing with empty hashes. Thanks Damien Mathieu Avoid Rack security warning no secret provided Conflicts: actionpack/CHANGELOG.md activerecord/CHANGELOG.md activesupport/CHANGELOG.md
| * bumping versionAaron Patterson2013-01-081-1/+1
| |
* | Merge tag 'v3.2.10' into 3-2-stableMiguel2013-01-031-1/+1
|\| | | | | | | Latest released tag was not fully merged into the stable branch (missed version bumping)
| * bumping version to 3.2.10Aaron Patterson2012-12-231-1/+1
| |
* | handled respond_to? with private methodsSHIBATA Hiroshi2012-12-032-2/+2
| |
* | Merge pull request #8352 from steveklabnik/update_7858Rafael Mendonça França2012-11-291-1/+6
|/ | | | | | | Specify type of singular assication during serialization Conflicts: activemodel/CHANGELOG.md activemodel/test/cases/serializers/xml_serialization_test.rb
* Bump to 3.2.9Santiago Pastorino2012-11-121-1/+1
|
* Bump up to 3.2.9.rc3Santiago Pastorino2012-11-091-1/+1
|
* Bump to 3.2.9.rc2Santiago Pastorino2012-11-011-1/+1
|
* Bump to 3.2.9.rc1Santiago Pastorino2012-10-291-2/+2
|
* Merge pull request #8038 from frodsan/fix_am_serializers_xml_dependencyJeremy Kemper2012-10-272-2/+6
| | | | Fix AM::Serializers::Xml dependency
* active_model/validations requires necessary files to runYves Senn2012-10-181-0/+1
|
* Bump to 3.2.8Santiago Pastorino2012-08-091-1/+1
|
* Bump to 3.2.8.rc2Santiago Pastorino2012-08-031-1/+1
|
* Bump to 3.2.8.rc1Santiago Pastorino2012-08-011-2/+2
|
* bumping to 3.2.7Aaron Patterson2012-07-261-1/+1
|
* updating the versionAaron Patterson2012-07-231-2/+2
|
* `validates_inclusion_of` and `validates_exclusion_of` now acceptRafael Mendonça França2012-07-202-10/+18
| | | | | | `:within` option as alias of `:in` as documented. Fix #7118
* Merge branch '3-2-stable-rel' into 3-2-stableAaron Patterson2012-06-121-1/+1
|\ | | | | | | | | | | | | | | | | | | * 3-2-stable-rel: updating changelogs bumping version numbers updating changelogs with security fixes updating changelogs Array parameters should not contain nil values. Additional fix for CVE-2012-2661
| * bumping version numbersAaron Patterson2012-06-111-1/+1
| |
* | Fix the the backport of the object dup with the ruby 1.9.3p194.Angelo capilleri2012-06-121-1/+2
|/ | | | | | At the end of initialize_dup was added the call to super if it exists, so it also works with 1.8.7 where initialize_dup doesn't exist. This issu was introduced with the pull request #6324
* Fix human attribute_name to handle deeply nested attributesTsutomu Kuroda2012-06-061-2/+2
| | | | | This is a back-port of b0e2fc84 to Rails 3.2. See #5843 and #3859 also.
* bumping to 3.2.5Aaron Patterson2012-05-311-1/+1
|
* bumping to 3.2.4Aaron Patterson2012-05-311-1/+1
|
* bumping to 3.2.4.rc1Aaron Patterson2012-05-281-2/+2
|
* fix validations docsFrancesco Rodriguez2012-05-179-116/+154
|
* add backport for the pull request #6324Angelo Capilleri2012-05-151-1/+9
|
* Fix indent from previous mergeCarlos Antonio da Silva2012-05-151-2/+2
|
* clean the errors if an object that includes validations errors is duped,for ↵Angelo capilleri2012-05-151-0/+6
| | | | | | 3-2-stable It Fixes #5953 in 3-2-stable, it's the same pull request of #6284
* Bump up to 3.2.3Santiago Pastorino2012-03-301-1/+1
|
* Bumping to 3.2.3.rc2Santiago Pastorino2012-03-291-1/+1
|
* Bumping to 3.2.3.rc1Santiago Pastorino2012-03-271-2/+2
|
* Improve docs for attr_accessible|protected related to Hash#except|sliceCarlos Antonio da Silva2012-03-091-8/+10
|
* bumping to 3.2.2Aaron Patterson2012-03-011-1/+1
|
* updating RAILS_VERSIONAaron Patterson2012-02-221-2/+2
|
* ruby 2.0 makes protected methods return false for respond_to, so pass true ↵Aaron Patterson2012-02-211-1/+1
| | | | as the second param
* Merge pull request #5049 from fabioyamate/masterJosé Valim2012-02-151-3/+3
| | | | Fix sanitize_for_mass_assigment when role is nil
* Generate strict validation error messages with attribute nameCarlos Antonio da Silva2012-02-012-10/+9
| | | | Backported from master.
* updating RAILS_VERSIONXavier Noria2012-01-261-1/+1
|
* allow requiring of 'active_model/naming'Paul McMahon2012-01-251-1/+1
| | | | | | | Requiring 'active_model/naming' will raise an uninitialized constant ActiveSupport::Deprecation exception because the module core extension doesn't require 'active_support/deprecation'. This require cannot be added to the core extension because of circular dependency issues.
* Preparing for 3.2.0 releaseDavid Heinemeier Hansson2012-01-201-1/+1
|
* Fix ActiveModel::Errors#dupPaweł Kondzior2012-01-161-1/+14
| | | | | | | | | | | | Since ActiveModel::Errors instance keeps all error messages as hash we should duplicate this object as well. Previously ActiveModel::Errors was a subclass of ActiveSupport::OrderedHash, which results in different behavior on dup, this may result in regression for people relying on it. Because Rails 3.2 stills supports Ruby 1.8.7 in order to properly fix this regression we need to backport #initialize_dup.
* Add ActiveModel::Errors#delete, which was not available after move to use ↵Piotr Sarnacki2012-01-161-0/+5
| | | | delegation
* Fix stack level too deep when model does not have attributes method.Piotr Sarnacki2012-01-151-1/+1
| | | | | | | | | | | Without that patch when using ActiveModel::AttributeMethods in a class that does not respond to `attributes` method, stack level too deep error will be raised on non existing method. While documentation is clear that you need to define `attributes` method in order to use AttributeMethods module, `stack level too deep` is rather obscure and hard to debug, therefore we should try to not break `method_missing` if someone forgets about defining `attributes`.
* Bump to rc2Santiago Pastorino2012-01-041-1/+1
|
* Party like its R-C-UNO!David Heinemeier Hansson2011-12-191-1/+1
|
* Fixed bug when error message is an empty string.Antonio Roberto2011-12-161-1/+2
|
* Improve cache on route_key lookup.José Valim2011-12-081-2/+23
|
* Ensure length validator also works on 1.8.7.José Valim2011-12-061-6/+17
|
* Merge pull request #3872 from marcandre/i18n_keyJosé Valim2011-12-061-2/+2
|\ | | | | ActiveModel::Name#i18n_key: Fix doc and add tests