Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update changelogs with release date [ci skip] | Carlos Antonio da Silva | 2013-01-09 | 1 | -1/+6 |
| | |||||
* | Merge branch '3-2-sec' into 3-2-secmerge | Aaron Patterson | 2013-01-08 | 1 | -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 version | Aaron Patterson | 2013-01-08 | 1 | -1/+1 |
| | | |||||
* | | Merge tag 'v3.2.10' into 3-2-stable | Miguel | 2013-01-03 | 1 | -1/+1 |
|\| | | | | | | | Latest released tag was not fully merged into the stable branch (missed version bumping) | ||||
| * | bumping version to 3.2.10 | Aaron Patterson | 2012-12-23 | 1 | -1/+1 |
| | | |||||
* | | Add release date of 3.2.10 | Rafael Mendonça França | 2013-01-02 | 1 | -1/+10 |
| | | | | | | | | Fix format and wrong changelog entry | ||||
* | | Merge branch '3-2-sec' into 3-2-secmerge | Aaron Patterson | 2012-12-23 | 1 | -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 changelogs | Aaron Patterson | 2012-12-23 | 1 | -0/+2 |
| | | |||||
| * | Add release date of Rails 3.2.9 to documentation | claudiob | 2012-12-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | Conflicts: actionpack/CHANGELOG.md activerecord/CHANGELOG.md activesupport/CHANGELOG.md | ||||
* | | handled respond_to? with private methods | SHIBATA Hiroshi | 2012-12-03 | 2 | -2/+2 |
| | | |||||
* | | Use 1.8 hash style in xml serialization test | Carlos Antonio da Silva | 2012-11-30 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #8352 from steveklabnik/update_7858 | Rafael Mendonça França | 2012-11-29 | 3 | -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 documentation | claudiob | 2012-11-12 | 1 | -1/+1 |
|/ | |||||
* | Bump to 3.2.9 | Santiago Pastorino | 2012-11-12 | 1 | -1/+1 |
| | |||||
* | Bump up to 3.2.9.rc3 | Santiago Pastorino | 2012-11-09 | 1 | -1/+1 |
| | |||||
* | Bump to 3.2.9.rc2 | Santiago Pastorino | 2012-11-01 | 1 | -1/+1 |
| | |||||
* | Bump to 3.2.9.rc1 | Santiago Pastorino | 2012-10-29 | 1 | -2/+2 |
| | |||||
* | Merge pull request #8038 from frodsan/fix_am_serializers_xml_dependency | Jeremy Kemper | 2012-10-27 | 4 | -5/+6 |
| | | | | Fix AM::Serializers::Xml dependency | ||||
* | active_model/validations requires necessary files to run | Yves Senn | 2012-10-18 | 1 | -0/+1 |
| | |||||
* | Update Active Model xml serialization test to reflect a change in builder | Carlos Antonio da Silva | 2012-09-07 | 2 | -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 branch | Xavier Noria | 2012-08-28 | 1 | -102/+1 |
| | | | | Check 810a50d for the rationale. | ||||
* | Bump to 3.2.8 | Santiago Pastorino | 2012-08-09 | 1 | -1/+1 |
| | |||||
* | Add release date to CHANGELOGs | Santiago Pastorino | 2012-08-09 | 1 | -1/+1 |
| | |||||
* | Bump to 3.2.8.rc2 | Santiago Pastorino | 2012-08-03 | 1 | -1/+1 |
| | |||||
* | Bump to 3.2.8.rc1 | Santiago Pastorino | 2012-08-01 | 1 | -2/+2 |
| | |||||
* | Add missing CHANGELOG entries | Santiago Pastorino | 2012-08-01 | 1 | -2/+6 |
| | | | | [ci skip] | ||||
* | updating release date | Aaron Patterson | 2012-07-26 | 1 | -1/+1 |
| | |||||
* | bumping to 3.2.7 | Aaron Patterson | 2012-07-26 | 1 | -1/+1 |
| | |||||
* | updating the version | Aaron Patterson | 2012-07-23 | 1 | -2/+2 |
| | |||||
* | updating changelogs | Aaron Patterson | 2012-07-23 | 1 | -0/+6 |
| | |||||
* | `validates_inclusion_of` and `validates_exclusion_of` now accept | Rafael Mendonça França | 2012-07-20 | 5 | -10/+60 |
| | | | | | | `:within` option as alias of `:in` as documented. Fix #7118 | ||||
* | Fix build | Francesco Rodríguez | 2012-06-12 | 1 | -1/+1 |
| | |||||
* | Merge branch '3-2-stable-rel' into 3-2-stable | Aaron Patterson | 2012-06-12 | 2 | -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 changelogs | Aaron Patterson | 2012-06-12 | 1 | -1/+1 |
| | | |||||
| * | bumping version numbers | Aaron Patterson | 2012-06-11 | 1 | -1/+1 |
| | | |||||
| * | updating changelogs | Aaron Patterson | 2012-06-11 | 1 | -0/+4 |
| | | |||||
* | | Fix the the backport of the object dup with the ruby 1.9.3p194. | Angelo capilleri | 2012-06-12 | 3 | -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 attributes | Tsutomu Kuroda | 2012-06-06 | 2 | -2/+7 |
| | | | | | This is a back-port of b0e2fc84 to Rails 3.2. See #5843 and #3859 also. | ||||
* | bumping to 3.2.5 | Aaron Patterson | 2012-05-31 | 1 | -1/+1 |
| | |||||
* | bumping to 3.2.4 | Aaron Patterson | 2012-05-31 | 1 | -1/+1 |
| | |||||
* | updating changelogs | Aaron Patterson | 2012-05-31 | 1 | -0/+4 |
| | |||||
* | bumping to 3.2.4.rc1 | Aaron Patterson | 2012-05-28 | 1 | -2/+2 |
| | |||||
* | fix validations docs | Francesco Rodriguez | 2012-05-17 | 9 | -116/+154 |
| | |||||
* | add backport for the pull request #6324 | Angelo Capilleri | 2012-05-15 | 1 | -1/+9 |
| | |||||
* | Fix indent from previous merge | Carlos Antonio da Silva | 2012-05-15 | 1 | -2/+2 |
| | |||||
* | clean the errors if an object that includes validations errors is duped,for ↵ | Angelo capilleri | 2012-05-15 | 2 | -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.3 | Rafael Mendonça França | 2012-04-30 | 1 | -1/+1 |
| | |||||
* | Updated other README to point 3-2-stable | Arun Agrawal | 2012-04-23 | 1 | -1/+1 |
| | |||||
* | fix typo in readme [ci skip] | Vijay Dev | 2012-04-12 | 1 | -1/+1 |
| | |||||
* | test against ruby features in order to fix tests on Ruby 2.0 | Aaron Patterson | 2012-04-12 | 1 | -1/+9 |
| |