aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
Commit message (Collapse)AuthorAgeFilesLines
* Update changelogs with release date [ci skip]Carlos Antonio da Silva2013-01-091-1/+6
|
* 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
| |
* | Add release date of 3.2.10Rafael Mendonça França2013-01-021-1/+10
| | | | | | | | Fix format and wrong changelog entry
* | Merge branch '3-2-sec' into 3-2-secmergeAaron Patterson2012-12-231-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-sec: CVE-2012-5664 options hashes should only be extracted if there are extra parameters updating changelog updating the changelogs updating the changelog for the CVE Add release date of Rails 3.2.9 to documentation Conflicts: actionmailer/CHANGELOG.md actionpack/CHANGELOG.md activemodel/CHANGELOG.md activerecord/CHANGELOG.md activeresource/CHANGELOG.md activesupport/CHANGELOG.md railties/CHANGELOG.md
| * updating the changelogsAaron Patterson2012-12-231-0/+2
| |
| * Add release date of Rails 3.2.9 to documentationclaudiob2012-12-231-1/+1
| | | | | | | | | | | | | | Conflicts: actionpack/CHANGELOG.md activerecord/CHANGELOG.md activesupport/CHANGELOG.md
* | handled respond_to? with private methodsSHIBATA Hiroshi2012-12-032-2/+2
| |
* | Use 1.8 hash style in xml serialization testCarlos Antonio da Silva2012-11-301-1/+1
| |
* | Merge pull request #8352 from steveklabnik/update_7858Rafael Mendonça França2012-11-293-3/+21
| | | | | | | | | | | | | | Specify type of singular assication during serialization Conflicts: activemodel/CHANGELOG.md activemodel/test/cases/serializers/xml_serialization_test.rb
* | Add release date of Rails 3.2.9 to documentationclaudiob2012-11-121-1/+1
|/
* 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-274-5/+6
| | | | Fix AM::Serializers::Xml dependency
* active_model/validations requires necessary files to runYves Senn2012-10-181-0/+1
|
* Update Active Model xml serialization test to reflect a change in builderCarlos Antonio da Silva2012-09-072-1/+14
| | | | | | | | | | | | | | | | | Due to a change in builder, nil values and empty strings now generates closed tags, so instead of this: <pseudonyms nil=\"true\"></pseudonyms> It generates this: <pseudonyms nil=\"true\"/> Document this change in Rails so that people can track it down easily if necessary. Conflicts: activemodel/CHANGELOG.md
* CHANGELOGs are now per branchXavier Noria2012-08-281-102/+1
| | | | Check 810a50d for the rationale.
* Bump to 3.2.8Santiago Pastorino2012-08-091-1/+1
|
* Add release date to CHANGELOGsSantiago 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
|
* Add missing CHANGELOG entriesSantiago Pastorino2012-08-011-2/+6
| | | | [ci skip]
* updating release dateAaron Patterson2012-07-261-1/+1
|
* bumping to 3.2.7Aaron Patterson2012-07-261-1/+1
|
* updating the versionAaron Patterson2012-07-231-2/+2
|
* updating changelogsAaron Patterson2012-07-231-0/+6
|
* `validates_inclusion_of` and `validates_exclusion_of` now acceptRafael Mendonça França2012-07-205-10/+60
| | | | | | `:within` option as alias of `:in` as documented. Fix #7118
* Fix buildFrancesco Rodríguez2012-06-121-1/+1
|
* Merge branch '3-2-stable-rel' into 3-2-stableAaron Patterson2012-06-122-1/+5
|\ | | | | | | | | | | | | | | | | | | * 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
| * updating changelogsAaron Patterson2012-06-121-1/+1
| |
| * bumping version numbersAaron Patterson2012-06-111-1/+1
| |
| * updating changelogsAaron Patterson2012-06-111-0/+4
| |
* | Fix the the backport of the object dup with the ruby 1.9.3p194.Angelo capilleri2012-06-123-1/+16
|/ | | | | | 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-062-2/+7
| | | | | 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
|
* updating changelogsAaron Patterson2012-05-311-0/+4
|
* 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-152-0/+21
| | | | | | 3-2-stable It Fixes #5953 in 3-2-stable, it's the same pull request of #6284
* Add release data to Rails 3.2.3Rafael Mendonça França2012-04-301-1/+1
|
* Updated other README to point 3-2-stableArun Agrawal2012-04-231-1/+1
|
* fix typo in readme [ci skip]Vijay Dev2012-04-121-1/+1
|
* test against ruby features in order to fix tests on Ruby 2.0Aaron Patterson2012-04-121-1/+9
|