Permalink
Commits on Mar 27, 2012
  1. Bumping to 3.2.3.rc1

    spastorino committed Mar 27, 2012
  2. Merge pull request #5603 from drogus/fix-rendered-format-for-render-p…

    josevalim committed Mar 27, 2012
    …artial
    
    Fix rendered format for render partial
  3. If partial is rendered in controller, grab format from template

    drogus committed Mar 26, 2012
    Previously `rendered_format` was set only based on mime types
    passed in Accept header, which was wrong if first type from
    Accept was different than rendered partial. The fix is to simply
    move setting rendered_format to the place where template
    is available and grab format from the template. If it fails
    we can fallback to formats passed by Accept header.
  4. Merge pull request #2621 from icco/master

    tenderlove committed Mar 27, 2012
    Issue with schema dump
Commits on Mar 26, 2012
  1. Merge pull request #5597 from carlosantoniodasilva/fix-build-3-2

    josevalim committed Mar 26, 2012
    Fix build for branch 3-2-stable - return the same session hash object
  2. Merge pull request #5596 from lest/patch-3

    drogus committed Mar 26, 2012
    apply form_for namespace option to date_select
Commits on Mar 24, 2012
  1. Return the same session data object when setting session id

    carlosantoniodasilva committed Mar 24, 2012
    Make sure to return the same hash object instead of returning a new one.
    Returning a new one causes failures on cookie store tests, where it
    tests for the 'Set-Cookie' header with the session signature.
    
    This is due to the hash ordering changes on Ruby 1.8.7-p358.
Commits on Mar 23, 2012
  1. Merge pull request #5537 from kennyj/fix_4399-32

    tenderlove committed Mar 23, 2012
    [3-2-stable] migrate(:down) method with table_name_prefix
  2. Merge pull request #5558 from carlosantoniodasilva/fix-build-3-2

    drogus committed Mar 23, 2012
    Fix build for branch 3-2-stable - Part 2
  3. Merge pull request #5557 from carlosantoniodasilva/fix-build-3-2

    tenderlove committed Mar 23, 2012
    Fix build for branch 3-2-stable
  4. Add order to tests that rely on db ordering, to fix failing tests on pg

    carlosantoniodasilva committed Mar 22, 2012
    Also skip persistente tests related to UPDATE + ORDER BY for postgresql
    
    PostgreSQL does not support updates with order by, and these tests are
    failing randomly depending on the fixture loading order now.
Commits on Mar 22, 2012
  1. Merge pull request #5525 from kennyj/fix_5411

    josevalim committed Mar 22, 2012
    Fix GH #5411. When precompiling, params method is undefined.
  2. Merge pull request #5542 from mhfs/port_5522_to_32stable

    drogus committed Mar 22, 2012
    Port of #5522 'Fix adding/removing field's index when generating migration'
Commits on Mar 21, 2012
  1. [3-2-stable] Port of #5522 'Fix adding/removing field's index when ge…

    mhfs committed Mar 21, 2012
    …nerating migration'
  2. Merge pull request #5533 from mhfs/migration_blank_line_3_2

    josevalim committed Mar 21, 2012
    [3-2-stable] Remove blank line from generated migration
Commits on Mar 20, 2012
  1. We dont need to merge in the parameters as thats all being reset by t…

    dhh committed Mar 20, 2012
    …he rack headers (and its causing problems for Strong Parameters attempt of wrapping request.parameters because it will change in testing)
Commits on Mar 19, 2012
  1. Merge pull request #5505 from arunagw/build_fix_1.8.7-3-2-stable

    josevalim committed Mar 19, 2012
    Build fix 1.8.7 3 2 stable
  2. Build fix for ruby1.8.7-358

    arunagw committed Mar 19, 2012
  3. Increase minimum version of mail.

    mikel committed Mar 19, 2012
      Second security vulnerability found in mail file delivery method
      patched in version 2.4.4.
Commits on Mar 18, 2012
  1. Merge pull request #5498 from arunagw/build_fix_app_generator_test_3-…

    josevalim committed Mar 18, 2012
    …2-stable
    
    Build fix app generator test 3 2 stable
  2. Merge pull request #5493 from kennyj/fix_5435-32

    drogus committed Mar 18, 2012
    [3-2-stable] Fix GH #5435. db:structure:dump should be re-enable.
Commits on Mar 17, 2012
  1. Add missing test for #5308

    drogus committed Mar 15, 2012
  2. Fix #5440 - multiple render_to_string breaks partials formats

    drogus committed Mar 15, 2012
    This fixes situation where rendering template to string
    sets `rendered_format` to the format rendered there.
    This is ok to have consistent formats rendered in partials,
    but it breaks on next renders if format is explicitly set
    or on last render where default format does not necessarily
    need to be the format of first rendered template.