Permalink
Switch branches/tags
Commits on Mar 28, 2012
  1. Test for #5626

    committed Mar 28, 2012
  2. Merge pull request #5616 from cbartlett/migration-indent

    Fix indenting in migration generator
    spastorino committed Mar 28, 2012
  3. Merge pull request #5624 from rafaelfranca/fix-build

    Fix build
    NZKoz committed Mar 28, 2012
Commits on Mar 27, 2012
  1. Merge pull request #5622 from rafaelfranca/fix-2492-3-2

    [3-2-stable] Fix label_tag to merge the options hash with the object hash
    jeremy committed Mar 27, 2012
  2. Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-haml

    Textarea newline fix breaks haml (3-2-stable)
    spastorino committed Mar 27, 2012
  3. adding a branch to arel

    tenderlove committed Mar 27, 2012
  4. Don't break Haml with textarea newline fix.

    See issue #393, issue #4000, issue #5190, and issue #5191. Adds a newline after the textarea opening tag based on @codykrieger's original patch so that we don't cause regressions in Haml-using apps. The regression caused textarea tags to add newlines to the field unintentionally (each update/save added an extra newline.)
    
    Also fix 6 more tests that didn't yet have the newline expectation.
    jcoleman committed Mar 27, 2012
  5. Merge pull request #5618 from lest/patch-1

    force datetime attributes to be changed
    committed Mar 27, 2012
  6. force datetime attributes to be changed

    backport ddb5d2f to 3-2-stable
    lest committed Mar 27, 2012
  7. Bumping to 3.2.3.rc1

    spastorino committed Mar 27, 2012
  8. Fixing issue #2492. ActionView::Base.field_error_proc doesn't call fo…

    …r label.
    
    objectify_options method should be applied to the proper options arg.
    
    See explanation and example of the bug - https://github.com/kryzhovnik/rails_field_error_proc_bug_example
    kryzhovnik committed Mar 27, 2012
  9. Merge pull request #5603 from drogus/fix-rendered-format-for-render-p…

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

    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.
    committed Mar 26, 2012
  11. Merge pull request #2621 from icco/master

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

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

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

    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.
    carlosantoniodasilva committed Mar 24, 2012
Commits on Mar 23, 2012
  1. Merge pull request #5537 from kennyj/fix_4399-32

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

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

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

    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.
    carlosantoniodasilva committed Mar 22, 2012
Commits on Mar 22, 2012
  1. Merge pull request #5525 from kennyj/fix_5411

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

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

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

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

    …he rack headers (and its causing problems for Strong Parameters attempt of wrapping request.parameters because it will change in testing)
    dhh committed Mar 20, 2012