Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Feb 27, 2013
  1. @steveklabnik
Commits on Feb 14, 2013
  1. @rafaelfranca
  2. @rafaelfranca
  3. @jmccartie
Commits on Feb 12, 2013
  1. @carlosantoniodasilva
Commits on Jan 25, 2013
  1. @rafaelfranca
Commits on Jan 14, 2013
  1. @dkubb
Commits on Jan 9, 2013
  1. @carlosantoniodasilva
Commits on Jan 8, 2013
  1. @tenderlove

    Merge branch '3-2-sec' into 3-2-secmerge

    tenderlove authored
    * 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
  2. @jeremy @tenderlove
Commits on Jan 2, 2013
  1. @rafaelfranca

    Add release date of 3.2.10

    rafaelfranca authored
    Fix format and wrong changelog entry
Commits on Dec 23, 2012
  1. @tenderlove

    Merge branch '3-2-sec' into 3-2-secmerge

    tenderlove authored
    * 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
  2. @claudiob @tenderlove

    Add release date of Rails 3.2.9 to documentation

    claudiob authored tenderlove committed
    Conflicts:
    	actionpack/CHANGELOG.md
    	activerecord/CHANGELOG.md
    	activesupport/CHANGELOG.md
Commits on Dec 15, 2012
  1. @zbskii @steveklabnik

    Remove unicode character encoding from ActiveSupport::JSON.encode

    zbskii authored steveklabnik committed
    The encoding scheme (e.g. ☠ -> "\u2620") was broken for characters
    not in the Basic Multilingual Plane.  It is possible to escape them
    for json using the weird encoding scheme of a twelve-character
    sequence representing the UTF-16 surrogate pair (e.g. '𠜎' ->
    "\u270e\u263a") but this wasn't properly handled in the escaping code.
    Since raw UTF-8 is allowed in json, it was decided to simply pass
    through the raw bytes rather than attempt to escape them.
    
    Backport of zbskii@9ace3a8
    
    Conflicts:
    
    	activesupport/CHANGELOG.md
    	activesupport/lib/active_support/json/encoding.rb
    	activesupport/test/json/encoding_test.rb
Commits on Nov 13, 2012
  1. @carlosantoniodasilva

    Revert "Use MiniTest in Ruby 1.8 if it is available."

    carlosantoniodasilva authored
    This reverts commit c3e186e.
    
    Reason: too many incompatibilities make a lot of Rails tests fail in 1.9.
    Might need more work to get this done properly in 3-2 if necessary.
  2. @carlosantoniodasilva
  3. @senny

    backport #8185, `#as_json` isolates options when encoding a hash.

    senny authored
    Setting options in a custom `#as_json` method had side effects.
    Modifications of the `options` hash leaked outside and influenced
    the conversion of other objects contained in the hash.
    
    Conflicts:
    
    	activesupport/CHANGELOG.md
  4. @claudiob
Commits on Nov 8, 2012
  1. @fxn @carlosantoniodasilva

    Merge pull request #8027 from daenney/master

    fxn authored carlosantoniodasilva committed
    Atomic.rb assumes it may chown/chmod a file but doesn't handle the EPERM error.
    
    Conflicts:
    	activesupport/CHANGELOG.md
    	guides/source/active_support_core_extensions.md
Commits on Sep 27, 2012
  1. @jeremy

    Add logger.push_tags and .pop_tags to complement logger.tagged

    jeremy authored
    Avoid memory leak from unflushed logs on other threads leaving tags behind.
    
    Conflicts:
    	activesupport/CHANGELOG.md
    	activesupport/lib/active_support/tagged_logging.rb
    	activesupport/test/tagged_logging_test.rb
Commits on Sep 20, 2012
  1. @kennyj
Commits on Aug 28, 2012
  1. @fxn

    CHANGELOGs are now per branch

    fxn authored
    Check 810a50d for the rationale.
Commits on Aug 9, 2012
  1. @amerine
  2. @spastorino
Commits on Aug 3, 2012
  1. @spastorino

    Add CHANGELOG entry

    spastorino authored
Commits on Aug 1, 2012
  1. @rafaelfranca

    Revert "Deprecate ActiveSupport::JSON::Variable"

    rafaelfranca authored
    This reverts commit bcfa013.
  2. @spastorino

    Add missing CHANGELOG entries

    spastorino authored
    [ci skip]
Commits on Jul 26, 2012
  1. @tenderlove

    updating release date

    tenderlove authored
Commits on Jul 23, 2012
  1. @tenderlove

    updating changelogs

    tenderlove authored
Commits on Jun 12, 2012
  1. @tenderlove

    updating changelogs

    tenderlove authored
Commits on Jun 11, 2012
  1. @tenderlove

    updating changelogs

    tenderlove authored
Commits on Jun 1, 2012
  1. @rafaelfranca
Commits on May 31, 2012
  1. @tenderlove

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

    tenderlove authored
    * 3-2-rel:
      bumping to 3.2.4
      adding security notifications to CHANGELOGs
      updating changelogs
      Merge pull request #6558 from parndt/fix_regression
  2. @tenderlove

    updating changelogs

    tenderlove authored
Commits on May 30, 2012
  1. Deprecate ActiveSupport::JSON::Variable

    Erich Menge authored
Something went wrong with that request. Please try again.