AtHeartEngineer/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-09 22:58:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3-2-13' into 3-2-stable

Browse Source 
* 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
This commit is contained in:
Aaron Patterson
2013-03-18 10:17:04 -07:00
parent 491d6916c9 a4b5582772
commit afcd01bf25
28 changed files with 98 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actionmailer/CHANGELOG.md
View File

@@ -3,7 +3,7 @@
* No changes.
## Rails 3.2.13.rc1 (Feb 17, 2013) ##
## Rails 3.2.13 ##
* No changes.

2
actionmailer/lib/action_mailer/version.rb
View File

@@ -2,7 +2,7 @@ module ActionMailer
module VERSION #:nodoc:
MAJOR = 3
MINOR = 2
TINY = 12
TINY = 13
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')