Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
tag: v3.2.11
Commits on Jan 8, 2013
  1. @tenderlove

    bumping version

    tenderlove authored
  2. @jeremy @tenderlove
  3. @tenderlove

    * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] …

    tenderlove authored
    …* dealing with empty hashes. Thanks Damien Mathieu
  4. @spastorino @tenderlove

    Avoid Rack security warning no secret provided

    spastorino authored tenderlove committed
    This avoids "SECURITY WARNING: No secret option provided to Rack::Session::Cookie."
Commits on Dec 23, 2012
  1. @tenderlove

    bumping version to 3.2.10

    tenderlove authored
  2. @tenderlove
  3. @tenderlove

    updating changelog

    tenderlove authored
  4. @tenderlove

    updating the changelogs

    tenderlove authored
  5. @tenderlove
  6. @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 Nov 12, 2012
  1. @spastorino

    Bump to 3.2.9

    spastorino authored
Commits on Nov 9, 2012
  1. @spastorino

    Revert "Add test case to assets eager load"

    spastorino authored
    This reverts commit 552a3e1.
  2. @spastorino

    Bump up to 3.2.9.rc3

    spastorino authored
  3. @rafaelfranca @spastorino

    Merge pull request #8161 from guilleiguaran/downgrade-sprockets

    rafaelfranca authored spastorino committed
    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.
  4. @spastorino

    Revert "Respect children paths filter settings"

    spastorino authored
    This reverts commit 53778ec.
    Closes #8146
Commits on Nov 2, 2012
  1. @spastorino
  2. @rafaelfranca
  3. @rafaelfranca

    Revert "Merge pull request #7668 from Draiken/fix_issue_6497"

    rafaelfranca authored
    This reverts commit 61d5d2d.
    
    Conflicts:
    	actionpack/CHANGELOG.md
    
    REASON: This added a backward incompatible change.
Commits on Nov 1, 2012
  1. @spastorino

    Bump to 3.2.9.rc2

    spastorino authored
  2. @carlosantoniodasilva
  3. @carlosantoniodasilva

    Fix issue with collection associations and first(n)/last(n)

    carlosantoniodasilva authored
    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.
Commits on Oct 31, 2012
  1. @fxn

    relaxes assertion

    fxn authored
    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.
  2. @josevalim

    Merge pull request #8083 from saks/fix_update_column_return_value

    josevalim authored
    Fix ActiveRecord#update_column return value
  3. @saks
  4. @rafaelfranca

    Revert "Merge pull request #7659 from HugoLnx/template_error_no_match…

    rafaelfranca authored
    …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.
  5. @rafaelfranca

    Revert "Merge pull request #7797 from senny/7459_prefix_tempalte_asse…

    rafaelfranca authored
    …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.
Commits on Oct 30, 2012
  1. @rafaelfranca

    Add CHANGELOG entry to #8032 fix

    rafaelfranca authored
    e6b4184 fixes that issue too.
    
    [ci skip]
  2. @rafaelfranca

    Fix typo :bomb: [ci skip]

    rafaelfranca authored
  3. @rafaelfranca

    Fix bug when Column is trying to type cast boolean values to integer.

    rafaelfranca authored
    This can occur if the user is using :integer columns to store boolean
    values. Now we are handling the boolean values but it still raises if
    the value can't type cast to integer and is not a boolean. See #7509.
    
    Fixes #8067.
Commits on Oct 29, 2012
  1. @rafaelfranca

    Merge pull request #8009 from graceliu/3-2-fix_database_url_support

    rafaelfranca authored
    fixed support for DATABASE_URL for rake db tasks
  2. @graceliu @rafaelfranca

    fixed support for DATABASE_URL for rake db tasks

    graceliu authored rafaelfranca committed
    Backport for #7521
    
    - added tests to confirm establish_connection uses DATABASE_URL and
      Rails.env correctly even when no arguments are passed in.
    - updated rake db tasks to support DATABASE_URL, and added tests to
      confirm correct behavior for these rake tasks.  (Removed
      establish_connection call from some tasks since in those cases
      the :environment task already made sure the function would be called)
    - updated Resolver so that when it resolves the database url, it
      removes hash values with empty strings from the config spec (e.g.
      to support connection to postgresql when no username is specified).
    - updated ResolverTest to use current_adapter? to check the type of
      the current adapter.
  3. @spastorino

    Bump to 3.2.9.rc1

    spastorino authored
  4. @spastorino

    Add 3.2.9 section in ARes CHANGELOG

    spastorino authored
    [ci skip]
  5. @rafaelfranca

    Revert "Deprecate Paths::Path#children which is unused now"

    rafaelfranca authored
    This reverts commit f7de647.
    
    We can't deprecate things in stable branches. I didn't not realized that
    the pull request was for 3-2-stable
  6. @rafaelfranca

    Merge pull request #7587 from elia/fix-too-eager-loading

    rafaelfranca authored
    Should not eager_load app/assets
Something went wrong with that request. Please try again.