diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2013-01-05 17:46:26 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-01-08 12:41:04 -0800 |
| commit | c31cc963daac55f6a3bca9da99b619276911dbd7 (patch) | |
| tree | bfae05fc707ae5529b60dbe10bfd5891dab8de73 /activesupport/CHANGELOG.md | |
| parent | 88cc1688d0cb828c17706b41a8bd27870f2a2beb (diff) | |
| download | rails-c31cc963daac55f6a3bca9da99b619276911dbd7.tar.gz rails-c31cc963daac55f6a3bca9da99b619276911dbd7.tar.bz2 rails-c31cc963daac55f6a3bca9da99b619276911dbd7.zip | |
Revert "Merge branch 'master-sec'"
This reverts commit 88cc1688d0cb828c17706b41a8bd27870f2a2beb, reversing
changes made to f049016cd348627bf8db0d72382d7580bf802a79.
Diffstat (limited to 'activesupport/CHANGELOG.md')
| -rw-r--r-- | activesupport/CHANGELOG.md | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 5848f9712f..08bec2f4ae 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,12 +1,5 @@ ## Rails 4.0.0 (unreleased) ## -* Hash.from_xml raises when it encounters type="symbol" or type="yaml". - Use Hash.from_trusted_xml to parse this XML. - - CVE-2013-0156 - - *Jeremy Kemper* - * Deprecate `assert_present` and `assert_blank` in favor of `assert object.blank?` and `assert object.present?` |