Permalink
Commits on Feb 11, 2013
  1. bumping version

    tenderlove committed Feb 11, 2013
  2. remove ruby-prof

    tenderlove committed Feb 11, 2013
Commits on Feb 10, 2013
  1. Fix issue with attr_protected where malformed input could circumvent

    protection
    
    Fixes: CVE-2013-0276
    joernchen committed with tenderlove Feb 9, 2013
  2. Bump rack dependency to 1.4.5

    Conflicts:
    	actionpack/actionpack.gemspec
    spastorino committed with tenderlove Feb 8, 2013
  3. Merge pull request #9224 from dylanahsmith/bigdecimal-takes-string

    [3.2] Fix test failure for ruby 1.8.
    guilleiguaran committed with tenderlove Feb 8, 2013
  4. Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric

    [3.2] active_record: Quote numeric values compared to string columns.
    Conflicts:
    	activerecord/CHANGELOG.md
    guilleiguaran committed with tenderlove Feb 8, 2013
Commits on Jan 8, 2013
  1. bumping version

    tenderlove committed Jan 8, 2013
  2. * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] …

    …* dealing with empty hashes. Thanks Damien Mathieu
    tenderlove committed Jan 4, 2013
  3. Avoid Rack security warning no secret provided

    This avoids "SECURITY WARNING: No secret option provided to Rack::Session::Cookie."
    spastorino committed with tenderlove Jan 8, 2013
Commits on Dec 23, 2012
  1. bumping version to 3.2.10

    tenderlove committed Dec 23, 2012
  2. updating changelog

    tenderlove committed Dec 23, 2012
  3. updating the changelogs

    tenderlove committed Dec 23, 2012
  4. Add release date of Rails 3.2.9 to documentation

    Conflicts:
    	actionpack/CHANGELOG.md
    	activerecord/CHANGELOG.md
    	activesupport/CHANGELOG.md
    claudiob committed with tenderlove Nov 13, 2012
Commits on Nov 12, 2012
  1. Bump to 3.2.9

    spastorino committed Nov 12, 2012
Commits on Nov 9, 2012
  1. Revert "Add test case to assets eager load"

    This reverts commit 552a3e1.
    spastorino committed Nov 9, 2012
  2. Bump up to 3.2.9.rc3

    spastorino committed Nov 9, 2012
  3. Merge pull request #8161 from guilleiguaran/downgrade-sprockets

    Lock sprockets to 2.2.x
    
    REASON: We had some pending fixes in sprockets and sass-rails to make possible to use sprockets version > 2.2. We will do a more conservative sprockets upgrade for this release.
    
    In a next release we can relax the dependency again.
    
    See #8099 for more information.
    rafaelfranca committed with spastorino Nov 9, 2012
  4. Revert "Respect children paths filter settings"

    This reverts commit 53778ec.
    Closes #8146
    spastorino committed Nov 9, 2012
Commits on Nov 2, 2012
  1. Revert "Merge pull request #7668 from Draiken/fix_issue_6497"

    This reverts commit 61d5d2d.
    
    Conflicts:
    	actionpack/CHANGELOG.md
    
    REASON: This added a backward incompatible change.
    rafaelfranca committed Nov 2, 2012
Commits on Nov 1, 2012
  1. Bump to 3.2.9.rc2

    spastorino committed Nov 1, 2012
  2. Fix issue with collection associations and first(n)/last(n)

    When calling first(n) or last(n) in a collection, Active Record was
    improperly trying to set the inverse of instance in case that option
    existed. This change was introduced by
    fdf4eae.
    
    In such cases we don't need to do that "manually", since the way
    collection will be loaded will already handle that, so we just skip
    setting the inverse association when any argument is given to
    first(n)/last(n).
    
    The test included ensures that these scenarios will have the inverse of
    instance set properly.
    
    Fixes #8087, Closes #8094.
    carlosantoniodasilva committed Nov 1, 2012
Commits on Oct 31, 2012
  1. relaxes assertion

    This method returns the status of the operation,
    but as we generally do in the code base it does
    not commit to any particular exact value. Hence,
    we do not have to check for a singleton, because
    if the implementation changes and returns some
    other true value the test should pass.
    fxn committed Oct 31, 2012
  2. Merge pull request #8083 from saks/fix_update_column_return_value

    Fix ActiveRecord#update_column return value
    josevalim committed Oct 31, 2012
  3. Revert "Merge pull request #7659 from HugoLnx/template_error_no_match…

    …es_rebased"
    
    This reverts commit 7d17cd2.
    
    Conflicts:
    	actionpack/CHANGELOG.md
    
    Reason: This added a regression since people were relying on this buggy behavior.
    This will introduce back #3849 but we will be backward compatible in
    stable release.
    
    Fixes #8068.
    rafaelfranca committed Oct 31, 2012
  4. Revert "Merge pull request #7797 from senny/7459_prefix_tempalte_asse…

    …rtion_variables"
    
    This reverts commit 2bad605.
    
    Conflicts:
    	actionpack/CHANGELOG.md
    
    Reason: This added a regression related with shoulda-matchers, since it
    is expecting the instance variable @layouts
    
    See https://github.com/thoughtbot/shoulda-matchers/blob/9e1188eea68c47d9a56ce6280e45027da6187ab1/lib/shoulda/matchers/action_controller/render_with_layout_matcher.rb#L74
    
    This will introduce back #7459 but this stable release will be backward compatible.
    Related with #8068.
    rafaelfranca committed Oct 31, 2012
Commits on Oct 30, 2012
  1. Add CHANGELOG entry to #8032 fix

    e6b4184 fixes that issue too.
    
    [ci skip]
    rafaelfranca committed Oct 30, 2012
  2. Fix typo 💣 [ci skip]

    rafaelfranca committed Oct 30, 2012