Permalink
Switch branches/tags
Commits on Mar 30, 2012
  1. refactor instantiate method in base, so we remove nesting if's which …

    arturopie committed Mar 27, 2012
    …make the code harder to read. Minor changes to contain_all_columns in IdentityMap.
    
    Conflicts:
    
    	activerecord/lib/active_record/base.rb
  2. refactor the checking of the attributes of the record in IdentityMap#…

    arturopie committed Mar 27, 2012
    …add, so it's more readable
  3. Do not add record to identity map if the record doesn't have values f…

    arturopie committed Mar 26, 2012
    …or all the columns, so we don't get 'MissingAttributeError' later when trying to access other fields of the same record.
Commits on Mar 29, 2012
  1. Merge pull request #5644 from andhapp/fix-config-asset-manifest-3-2

    spastorino committed Mar 29, 2012
    Changed the config.assets.manifest to nil
Commits on Mar 28, 2012
  1. Changed the config.assets.manifest to nil in the comments in the prod…

    andhapp committed Mar 28, 2012
    …uction config template.
  2. Merge pull request #5640 from yahonda/address_ora_00918_with_oracle

    spastorino committed Mar 28, 2012
    Address an error for test_has_many_through_polymorphic_has_one with Oracle
  3. Change the order argument from ('id') to ('taggings.id')

    yahonda committed Mar 28, 2012
    to address ORA-00918 error
  4. Cover one more case in auth_token and remote forms

    drogus committed Mar 28, 2012
    If embedding auth_token in remote forms is off and we
    pass a value for auth_token it should respect it.
  5. Fix #5549.

    jonleighton committed Mar 28, 2012
  6. Test for #5549.

    tenderlove authored and jonleighton committed Mar 27, 2012
    Cherry-picked from e96d04a.
    
    Conflicts:
    
    	activerecord/lib/active_record/attribute_methods/read.rb
  7. Merge pull request #5633 from drogus/embed-auth-token-in-remote-forms

    spastorino committed Mar 28, 2012
    Embed auth token in remote forms
  8. Added config.action_view.embed_authenticity_token_in_remote_forms

    drogus committed Mar 28, 2012
    There is a regression introduced in 16ee611, which breaks
    remote forms that should also work without javascript. This commit
    introduces config option that allows to configure this behavior
    defaulting to the old behavior (ie. include authenticity token
    in remote forms by default)
  9. Merge pull request #5616 from cbartlett/migration-indent

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

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

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

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

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

    jcoleman committed Mar 27, 2012
    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.
  5. Merge pull request #5618 from lest/patch-1

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

    lest committed Mar 27, 2012
    backport ddb5d2f to 3-2-stable
  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…

    kryzhovnik committed Mar 27, 2012
    …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
  9. Merge pull request #5603 from drogus/fix-rendered-format-for-render-p…

    josevalim committed Mar 27, 2012
    …artial
    
    Fix rendered format for render partial
  10. 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.
  11. 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.