Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Preparing for 3.2.14.rc1 release | Rafael Mendonça França | 2013-07-12 | 2 | -3/+5 |
| | |||||
* | Add license to the gemspec | Rafael Mendonça França | 2013-07-08 | 1 | -0/+2 |
| | |||||
* | Support include_root_in_json for ActiveResource properly. | Xinjiang Lu | 2013-05-15 | 3 | -3/+19 |
| | | | | | | This commit is a backport from https://github.com/rails/activeresource/pull/29. The ActiveResource's include_root_in_json option is broken for 3.2.x. | ||||
* | Add release dates to documentation [ci skip] | claudiob | 2013-03-18 | 1 | -1/+1 |
| | | | | Set "March 18, 2013" as the release date for 3.2.13 | ||||
* | Merge branch '3-2-13' into 3-2-stable | Aaron Patterson | 2013-03-18 | 2 | -3/+2 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-13: bumping to 3.2.13 fix protocol checking in sanitization [CVE-2013-1857] JDOM XXE Protection [CVE-2013-1856] fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] stop calling to_sym when building arel nodes [CVE-2013-1854] Merge pull request #9616 from exviva/multiple_select_name_double_square_brackets bumping to rc2 Revert "Merge pull request #8209 from senny/backport_8176" Freeze columns only once per Result Preparing for 3.2.13.rc1 release Update CHANGELOGs for 3.2.13 release. Conflicts: actionmailer/CHANGELOG.md actionpack/CHANGELOG.md activemodel/CHANGELOG.md activeresource/CHANGELOG.md activesupport/CHANGELOG.md railties/CHANGELOG.md | ||||
| * | bumping to 3.2.13 | Aaron Patterson | 2013-03-18 | 1 | -1/+1 |
| | | |||||
| * | bumping to rc2 | Aaron Patterson | 2013-03-06 | 1 | -1/+1 |
| | | |||||
| * | Preparing for 3.2.13.rc1 release | Steve Klabnik | 2013-02-27 | 1 | -2/+2 |
| | | |||||
| * | Update CHANGELOGs for 3.2.13 release. | Steve Klabnik | 2013-02-27 | 1 | -0/+4 |
| | | |||||
* | | Update CHANGELOGs for 3.2.13.rc1 | Steve Klabnik | 2013-03-05 | 1 | -0/+5 |
|/ | |||||
* | Do not put the version in unreleased changes [ci skip] | Rafael Mendonça França | 2013-02-14 | 1 | -1/+1 |
| | |||||
* | Fix the CHANGELOG headers [ci skip] | Rafael Mendonça França | 2013-02-14 | 1 | -0/+5 |
| | |||||
* | Fixed changelog typos [ci skip] | Jon McCartie | 2013-02-14 | 1 | -1/+1 |
| | |||||
* | Update changelogs with version/release dates [ci skip] | Carlos Antonio da Silva | 2013-02-11 | 1 | -1/+3 |
| | |||||
* | Merge branch '3-2-sec' into 3-2-stable | Aaron Patterson | 2013-02-11 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-sec: bumping version remove ruby-prof Fix issue with attr_protected where malformed input could circumvent protection fixing call to columns hash. run the damn tests when you backport! Bump rack dependency to 1.4.5 Merge pull request #9224 from dylanahsmith/bigdecimal-takes-string Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric Conflicts: Gemfile activerecord/CHANGELOG.md | ||||
| * | bumping version | Aaron Patterson | 2013-02-10 | 1 | -1/+1 |
| | | |||||
* | | Update changelogs with release date [ci skip] | Carlos Antonio da Silva | 2013-01-09 | 1 | -1/+7 |
| | | |||||
* | | Remove test for XML YAML parsing | Prem Sichanugrist | 2013-01-08 | 2 | -27/+0 |
| | | | | | | | | | | The support for YAML parsing in XML has been removed from Active Support since it introduced an security risk. See 43109ec for more detail. | ||||
* | | 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/+8 |
| | | | | | | | | Fix format and wrong changelog entry | ||||
* | | Merge branch '3-2-sec' into 3-2-secmerge | Aaron Patterson | 2012-12-23 | 1 | -0/+4 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | | Update mocha version to 0.13.0 and change requires | Carlos Antonio da Silva | 2012-11-13 | 1 | -1/+1 |
| | | |||||
* | | 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 |
| | |||||
* | Add 3.2.9 section in ARes CHANGELOG | Santiago Pastorino | 2012-10-29 | 1 | -0/+4 |
| | | | | [ci skip] | ||||
* | 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/+4 |
| | |||||
* | 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 |
| | |||||
* | Add release date of 3.2.5 on the CHANGELOG | Rafael Mendonça França | 2012-06-01 | 1 | -0/+6 |
| | |||||
* | 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 |
| |